Commit f01b9b73 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull support for three new arm SoC types from Arnd Bergmann:

 - The mvebu platform includes Marvell's Armada XP and Armada 370 chips,
   made by the mvebu business unit inside of Marvell.  Since the same
   group also made the older but similar platforms we call "orion5x",
   "kirkwood", "mv78xx0" and "dove", we plan to move all of them into
   the mach-mvebu directory in the future.

 - socfpga is Altera's platform based on Cortex-A9 cores and a lot of
   FPGA space.  This is similar to the Xilinx zynq platform we already
   support.  The code is particularly clean, which is helped by the fact
   that the hardware doesn't do much besides the parts that are expected
   to get added in the FPGA.

 - The OMAP subarchitecture gains support for the latest generation, the
   OMAP5 based on the new Cortex-A15 core.  Support is rather
   rudimentary for now, but will be extended in the future.

* tag 'newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
  ARM: socfpga: initial support for Altera's SOCFPGA platform
  arm: mvebu: generate DTBs for supported SoCs
  ARM: mvebu: MPIC: read number of interrupts from control register
  arm: mach-mvebu: add entry to MAINTAINERS
  arm: mach-mvebu: add compilation/configuration change
  arm: mach-mvebu: add defconfig
  arm: mach-mvebu: add documentation for new device tree bindings
  arm: mach-mvebu: add support for Armada 370 and Armada XP with DT
  arm: mach-mvebu: add source files
  arm: mach-mvebu: add header
  clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
  ARM: Kconfig update to support additional GPIOs in OMAP5
  ARM: OMAP5: Add the build support
  arm/dts: OMAP5: Add omap5 dts files
  ARM: OMAP5: board-generic: Add device tree support
  ARM: omap2+: board-generic: clean up the irq data from board file
  ARM: OMAP5: Add SMP support
  ARM: OMAP5: Add the WakeupGen IP updates
  ARM: OMAP5: l3: Add l3 error handler support for omap5
  ARM: OMAP5: gpmc: Update gpmc_init()
  ...

Conflicts:
	Documentation/devicetree/bindings/arm/omap/omap.txt
	arch/arm/mach-omap2/Makefile
	drivers/clocksource/Kconfig
	drivers/clocksource/Makefile
parents fde75430 66314223

Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Marvell Armada 370 and Armada XP Interrupt Controller

-----------------------------------------------------



Required properties:

- compatible: Should be "marvell,mpic"

- interrupt-controller: Identifies the node as an interrupt controller.

- #interrupt-cells: The number of cells to define the interrupts. Should be 1.

  The cell is the IRQ number

- reg: Should contain PMIC registers location and length. First pair

  for the main interrupt registers, second pair for the per-CPU

  interrupt registers



Example:



        mpic: interrupt-controller@d0020000 {

              compatible = "marvell,mpic";

              #interrupt-cells = <1>;

              #address-cells = <1>;

              #size-cells = <1>;

              interrupt-controller;

              reg = <0xd0020000 0x1000>,

                    <0xd0021000 0x1000>;

        };

Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
Marvell Armada 370 and Armada XP Global Timers

----------------------------------------------



Required properties:

- compatible: Should be "marvell,armada-370-xp-timer"

- interrupts: Should contain the list of Global Timer interrupts

- reg: Should contain the base address of the Global Timer registers



Optional properties:

- marvell,timer-25Mhz: Tells whether the Global timer supports the 25

  Mhz fixed mode (available on Armada XP and not on Armada 370)

Documentation/devicetree/bindings/arm/armada-370-xp.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Marvell Armada 370 and Armada XP Platforms Device Tree Bindings

---------------------------------------------------------------



Boards with a SoC of the Marvell Armada 370 and Armada XP families

shall have the following property:



Required root node property:



compatible: must contain "marvell,armada-370-xp"



In addition, boards using the Marvell Armada 370 SoC shall have the

following property:



Required root node property:



compatible: must contain "marvell,armada370"



In addition, boards using the Marvell Armada XP SoC shall have the

following property:



Required root node property:



compatible: must contain "marvell,armadaxp"

Documentation/devicetree/bindings/arm/mvebu-system-controller.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
MVEBU System Controller

-----------------------

MVEBU (Marvell SOCs: Armada 370/XP, Dove, mv78xx0, Kirkwood, Orion5x)



Required properties:



- compatible: one of:

	- "marvell,orion-system-controller"

	- "marvell,armada-370-xp-system-controller"

- reg: Should contain system controller registers location and length.



Example:



	system-controller@d0018200 {

		compatible = "marvell,armada-370-xp-system-controller";

		reg = <0xd0018200 0x500>;

	};

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -50,3 +50,6 @@ Boards: 


- AM335X Bone : Low cost community board

  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"



- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"

CRA Git | Maintained and supported by SUSTech CRA and CCSE