Commit 81ab1f74 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'mvebu/newsoc' into next/newsoc 

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

You'll find in this patch set the nineth version of the initial
support for a new family of ARMv7-compatible Marvell SoCs.

As for the previous releases, both the Armada 370 and the Armada XP
SoCs are supported in this directory, and we are able to build a
single kernel image that boots on both SoCs. Both SoCs use the PJ4B
processor, a Marvell-developed ARM core that implements the ARMv7
instruction set. We are currently using Marvell evaluation boards for
both of those SoCs, and the support for those boards is added in this
patch set.

This patch set, and the support for those SoCs, started as a
collaborative effort from Marvell engineers (who have done the initial
development work) and Free Electrons engineers (who are reshaping the
code for mainline submission, adding device tree support, etc.). This
effort has also received contributions from Ben Dooks from Codethink.

* mvebu/newsoc:
  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

Changes from Arnd
* Pulled from git://github.com/Marvell-Semi/EBU_mainline_public.git

 mvebu_for-next-V9
* rebased onto v3.5-rc5 because it was originally based on
  an old arm-soc/for-next branch

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6887a413 f3e16ccd

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>;

	};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -894,6 +894,14 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained



ARM/Marvell Armada 370 and Armada XP SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-mvebu/



ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

CRA Git | Maintained and supported by SUSTech CRA and CCSE