Commit 54cab10f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'mvebu/soc3' into next/dt 



The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e887ae25 00e8ec2f

Documentation/arm/Marvell/README

+11 −1
Original line number Diff line number Diff line
@@ -83,14 +83,24 @@ EBU Armada family 
        88F6710

        88F6707

        88F6W11

    Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf



  Armada 375 Flavors:

	88F6720

    Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA_375_SoC-01_product_brief.pdf



  Armada 380/385 Flavors:

	88F6810

	88F6820

	88F6828



  Armada XP Flavors:

        MV78230

        MV78260

        MV78460

    NOTE: not to be confused with the non-SMP 78xx0 SoCs



    Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf



  No public datasheet available.



  Core: Sheeva ARMv7 compatible

Documentation/devicetree/bindings/arm/armada-375.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Marvell Armada 375 Platforms Device Tree Bindings

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



Boards with a SoC of the Marvell Armada 375 family shall have the

following property:



Required root node property:



compatible: must contain "marvell,armada375"

Documentation/devicetree/bindings/arm/armada-38x.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Marvell Armada 38x Platforms Device Tree Bindings

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



Boards with a SoC of the Marvell Armada 38x family shall have the

following property:



Required root node property:



 - compatible: must contain either "marvell,armada380" or

   "marvell,armada385" depending on the variant of the SoC being used.

Documentation/devicetree/bindings/arm/mrvl/feroceon.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* Marvell Feroceon Cache



Required properties:

- compatible : Should be either "marvell,feroceon-cache" or

  	       "marvell,kirkwood-cache".



Optional properties:

- reg        : Address of the L2 cache control register. Mandatory for

  	       "marvell,kirkwood-cache", not used by "marvell,feroceon-cache"





Example:

		l2: l2-cache@20128 {

			compatible = "marvell,kirkwood-cache";

			reg = <0x20128 0x4>;

		};

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

+2 −1
Original line number Diff line number Diff line 
MVEBU System Controller

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

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

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



Required properties:



- compatible: one of:

	- "marvell,orion-system-controller"

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

	- "marvell,armada-375-system-controller"

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



Example: