Commit c98ce6bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "mvebu soc changes for v4.1 (part #1)" from Gregory CLEMENT:

- Add support for a new SoC: Armada 39x

* tag 'mvebu-soc-4.1' of git://git.infradead.org/linux-mvebu:
  Documentation: arm: update supported Marvell EBU processors
  ARM: mvebu: add core support for Armada 39x
  devicetree: bindings: add new SMP enable method for Marvell Armada 39x
  devicetree: bindings: add DT binding for the Marvell Armada 39x SoC family
parents 0a9061c3 0d9ab18e

Documentation/arm/Marvell/README

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ EBU Armada family 
	88F6820

	88F6828



  Armada 390/398 Flavors:

	88F6920

	88F6928

    Product infos: http://www.marvell.com/embedded-processors/armada-39x/



  Armada XP Flavors:

        MV78230

        MV78260

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

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

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



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

following property:



Required root node property:



 - compatible: must contain "marvell,armada390"



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

following property before the previous one:



Required root node property:



compatible: must contain "marvell,armada398"



Example:



compatible = "marvell,a398-db", "marvell,armada398", "marvell,armada390";

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ nodes to be present and contain the properties described below. 
			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

			    "marvell,armada-380-smp"

			    "marvell,armada-390-smp"

			    "marvell,armada-xp-smp"

			    "qcom,gcc-msm8660"

			    "qcom,kpss-acc-v1"

arch/arm/mach-mvebu/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -64,6 +64,20 @@ config MACH_ARMADA_38X 
	  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_39X

	bool "Marvell Armada 39x boards" if ARCH_MULTI_V7

	select ARM_GIC

	select ARMADA_39X_CLK

	select CACHE_L2X0

	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_39X

	help

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

	  on the Marvell Armada 39x SoC with device tree.



config MACH_ARMADA_XP

	bool "Marvell Armada XP boards" if ARCH_MULTI_V7

	select ARMADA_XP_CLK

arch/arm/mach-mvebu/board-v7.c

+14 −0
Original line number Diff line number Diff line
@@ -232,3 +232,17 @@ DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)") 
	.restart	= mvebu_restart,

	.dt_compat	= armada_38x_dt_compat,

MACHINE_END



static const char * const armada_39x_dt_compat[] __initconst = {

	"marvell,armada390",

	"marvell,armada398",

	NULL,

};



DT_MACHINE_START(ARMADA_39X_DT, "Marvell Armada 39x (Device Tree)")

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.init_irq       = mvebu_init_irq,

	.restart	= mvebu_restart,

	.dt_compat	= armada_39x_dt_compat,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE