Commit 88dbede1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu into next/soc 

Merge "mvebu new SoCs for v3.15" from Jason Cooper:

 - mvebu
    - initial support for Armada 375, 380, and 385

Depends:
 - tags/mvebu-soc-3.15 (resolves delete/rename hidden conflict)

* tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu

:
  Documentation: arm: update Marvell documentation about Armada 375/38x
  ARM: mvebu: add initial support for the Armada 380/385 SOCs
  ARM: mvebu: add workaround for data abort issue on Armada 375
  ARM: mvebu: add initial support for the Armada 375 SOCs
  ARM: mvebu: add Armada 375 support to the system-controller driver
  ARM: mvebu: make CPU_PJ4B selection a per-SoC choice
  ARM: mvebu: rename DT machine structure for Armada 370/XP
  ARM: mvebu: rename armada-370-xp.c to board-v7.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4a70931b bc81526f

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 SOC with device tree"



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"

	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"

	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

CRA Git | Maintained and supported by SUSTech CRA and CCSE