Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa89b0ad authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'mvebu/soc-3xx' into mvebu/soc

parents b92f10be 665ca874

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/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:

arch/arm/mach-mvebu/Kconfig

+33 −4
Original line number Diff line number Diff line
@@ -21,26 +21,55 @@ if ARCH_MVEBU 


menu "Marvell EBU SoC variants"



config MACH_ARMADA_370_XP

config MACH_MVEBU_V7

	bool

	select ARMADA_370_XP_TIMER

	select HAVE_SMP

	select CACHE_L2X0

	select CPU_PJ4B



config MACH_ARMADA_370

	bool "Marvell Armada 370 boards"

	select ARMADA_370_CLK

	select MACH_ARMADA_370_XP

	select CPU_PJ4B

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_370

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada 370 SoC with device tree.



config MACH_ARMADA_375

	bool "Marvell Armada 375 boards" if ARCH_MULTI_V7

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select ARM_GIC

	select ARMADA_375_CLK

	select CPU_V7

	select MACH_MVEBU_V7

	select NEON

	select PINCTRL_ARMADA_375

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada 375 SoC with device tree.



config MACH_ARMADA_38X

	bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select ARM_GIC

	select ARMADA_38X_CLK

	select CPU_V7

	select MACH_MVEBU_V7

	select NEON

	select PINCTRL_ARMADA_38X

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada 380/385 SoC with device tree.



config MACH_ARMADA_XP

	bool "Marvell Armada XP boards"

	select ARMADA_XP_CLK

	select MACH_ARMADA_370_XP

	select CPU_PJ4B

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_XP

	help

	  Say 'Y' here if you want your kernel to support boards based