Commit 7adb2781 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'versatile-v5.8-1' of... 

Merge tag 'versatile-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/soc

Versatile family updates for the v5.8 kernel series:

- Drop unneeded SPARSE_IRQ selection.
- Drop a bunch of other unneed selections already
  selected by multiplatform overall Kconfig.
- Remove the dead sched_clock() code in plat-versatile.
- Drop the mapping of the IB2 registers. Now handled
  by the PL11x DRM driver.
- Add a bus driver for the Integrator/AP logic modules,
  along with its device tree bindings.
- Retire the LM and IM-PD1 boardfile code: we now handle
  this with the bus driver and device tree.
- Select some Integrator features needed for boot in
  its KConfig.
- Fix a minor MAINTAINERS entry.

* tag 'versatile-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  MAINTAINERS: adjust to renaming physmap_of_versatile.c
  ARM: integrator: Add some Kconfig selections
  ARM: integrator: Retire LM and IM-PD1 boardfile code
  bus: Add driver for Integrator/AP logic modules
  bus: Add DT bindings for Integrator/AP logic modules
  ARM: versatile: Drop mapping IB2 module registers
  ARM: versatile: Remove dead sched_clock code
  ARM: realview: Drop unneeded select of multi-platform features
  ARM: integrator: Drop unneeded select of SPARSE_IRQ

Link: https://lore.kernel.org/r/CACRpkdZR5LnnvrCnXodaTsam9-BuW+LkYSc+6jq-EisrRsq2eQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0e698dfa 899895fb

Documentation/devicetree/bindings/bus/arm,integrator-ap-lm.yaml

0 → 100644
+83 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/bus/arm,integrator-ap-lm.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Integrator/AP Logic Module extension bus



maintainers:

  - Linus Walleij <linusw@kernel.org>



description: The Integrator/AP is a prototyping platform and as such has a

  site for stacking up to four logic modules (LM) designed specifically for

  use with this platform. A special system controller register can be read to

  determine if a logic module is connected at index 0, 1, 2 or 3. The logic

  module connector is described in this binding. The logic modules per se

  then have their own specific per-module bindings and they will be described

  as subnodes under this logic module extension bus.



properties:

  "#address-cells":

    const: 1



  "#size-cells":

    const: 1



  compatible:

    items:

      - const: arm,integrator-ap-lm



  ranges: true

  dma-ranges: true



patternProperties:

  "^bus(@[0-9a-f]*)?$":

    description: Nodes on the Logic Module bus represent logic modules

      and are named with bus. The first module is at 0xc0000000, the second

      at 0xd0000000 and so on until the top of the memory of the system at

      0xffffffff. All information about the memory used by the module is

      in ranges and dma-ranges.

    type: object



    required:

      - compatible



required:

  - compatible



examples:

  - |

    bus@c0000000 {

      compatible = "arm,integrator-ap-lm";

      #address-cells = <1>;

      #size-cells = <1>;

      ranges = <0xc0000000 0xc0000000 0x40000000>;

      dma-ranges;



      bus@c0000000 {

        compatible = "simple-bus";

        ranges = <0x00000000 0xc0000000 0x10000000>;

        /* The Logic Modules sees the Core Module 0 RAM @80000000 */

        dma-ranges = <0x00000000 0x80000000 0x10000000>;

        #address-cells = <1>;

        #size-cells = <1>;



        serial@100000 {

          compatible = "arm,pl011", "arm,primecell";

          reg = <0x00100000 0x1000>;

          interrupts-extended = <&impd1_vic 1>;

        };



        impd1_vic: interrupt-controller@3000000 {

          compatible = "arm,pl192-vic";

          interrupt-controller;

          #interrupt-cells = <1>;

          reg = <0x03000000 0x1000>;

          valid-mask = <0x00000bff>;

          interrupts-extended = <&pic 9>;

        };

      };

    };



additionalProperties: false

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1338,10 +1338,11 @@ F: arch/arm/mach-integrator/ 
F:	arch/arm/mach-realview/

F:	arch/arm/mach-versatile/

F:	arch/arm/plat-versatile/

F:	drivers/bus/arm-integrator-lm.c

F:	drivers/clk/versatile/

F:	drivers/i2c/busses/i2c-versatile.c

F:	drivers/irqchip/irq-versatile-fpga.c

F:	drivers/mtd/maps/physmap_of_versatile.c

F:	drivers/mtd/maps/physmap-versatile.*

F:	drivers/power/reset/arm-versatile-reboot.c

F:	drivers/soc/versatile/


































arch/arm/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -735,7 +735,6 @@ source "arch/arm/mach-ux500/Kconfig"







source "arch/arm/mach-versatile/Kconfig"



















source "arch/arm/mach-vexpress/Kconfig"









source "arch/arm/plat-versatile/Kconfig"



















source "arch/arm/mach-vt8500/Kconfig"












































arch/arm/mach-integrator/Kconfig



+4
−4






























Original line number
Diff line number
Diff line







@@ -4,6 +4,8 @@ menuconfig ARCH_INTEGRATOR







	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6









	select ARM_AMBA









	select COMMON_CLK_VERSATILE









	select CMA









	select DMA_CMA









	select HAVE_TCM









	select ICST









	select MFD_SYSCON










@@ -12,7 +14,6 @@ menuconfig ARCH_INTEGRATOR







	select POWER_RESET_VERSATILE









	select POWER_SUPPLY









	select SOC_INTEGRATOR_CM









	select SPARSE_IRQ









	select VERSATILE_FPGA_IRQ









	help









	  Support for ARM's Integrator platform.










@@ -35,14 +36,13 @@ config INTEGRATOR_IMPD1







	select ARM_VIC









	select GPIO_PL061









	select GPIOLIB









	select REGULATOR









	select REGULATOR_FIXED_VOLTAGE









	help









	  The IM-PD1 is an add-on logic module for the Integrator which









	  allows ARM(R) Ltd PrimeCells to be developed and evaluated.









	  The IM-PD1 can be found on the Integrator/PP2 platform.



















	  To compile this driver as a module, choose M here: the









	  module will be called impd1.



















config INTEGRATOR_CM7TDMI









	bool "Integrator/CM7TDMI core module"









	depends on ARCH_INTEGRATOR_AP


































arch/arm/mach-integrator/Makefile



+1
−2






























Original line number
Diff line number
Diff line







@@ -5,7 +5,6 @@

















# Object file lists.



















obj-y					:= core.o lm.o









obj-y					:= core.o









obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o









obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o








obj-$(CONFIG_INTEGRATOR_IMPD1)		+= impd1.o