From af987718f0bb238a7f09bf6aa9b87c7121e3bbd3 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Tue, 18 Mar 2014 15:32:46 +0100 Subject: [PATCH 1/4] ARM: berlin: add Marvell Armada 1500 pro to Marvell doc This adds Marvell Berlin Armada 1500 Pro (BG2Q) to Marvell SoC documentation. Signed-off-by: Antoine Tenart Signed-off-by: Sebastian Hesselbarth --- Documentation/arm/Marvell/README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/arm/Marvell/README b/Documentation/arm/Marvell/README index 963ec445e15a..2cce5401e323 100644 --- a/Documentation/arm/Marvell/README +++ b/Documentation/arm/Marvell/README @@ -234,6 +234,11 @@ Berlin family (Digital Entertainment) Core: Marvell PJ4B (ARMv7), Tauros3 L2CC Homepage: http://www.marvell.com/digital-entertainment/armada-1500/ Product Brief: http://www.marvell.com/digital-entertainment/armada-1500/assets/Marvell-ARMADA-1500-Product-Brief.pdf + 88DE3114, Armada 1500 Pro + Design name: BG2-Q + Core: Quad Core ARM Cortex-A9, PL310 L2CC + Homepage: http://www.marvell.com/digital-entertainment/armada-1500-pro/ + Product Brief: http://www.marvell.com/digital-entertainment/armada-1500-pro/assets/Marvell_ARMADA_1500_PRO-01_product_brief.pdf 88DE???? Design name: BG3 Core: ARM Cortex-A15, CA15 integrated L2CC From cb56c643cc167a9e5e5fa2fbc3111ce6222eec32 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Fri, 21 Mar 2014 20:39:16 +0100 Subject: [PATCH 2/4] ARM: berlin: add MACH_BERLIN_BG2Q symbol Now that we start supporting the Marvell Berlin BG2Q, add a symbol allowing to differentiate that SoC from the other SoCs of the Berlin family. Signed-off-by: Alexandre Belloni Signed-off-by: Sebastian Hesselbarth --- arch/arm/mach-berlin/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index b0cb0722acd2..9266ae38a5c1 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -20,6 +20,11 @@ config MACH_BERLIN_BG2CD select CACHE_L2X0 select HAVE_ARM_TWD if SMP +config MACH_BERLIN_BG2Q + bool "Marvell Armada 1500 Pro (BG2-Q)" + select CACHE_L2X0 + select HAVE_ARM_TWD if SMP + endmenu endif From d45fa871c06762ab7e10ea4d889ab5be61d41ab1 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Wed, 16 Apr 2014 09:46:34 +0200 Subject: [PATCH 3/4] ARM: berlin: add the LIBGPIO as a dependency for the BG2Q The BG2Q has GPIOs driven by the dwapb GPIO driver. Add the LIBGPIO as a dependency to be able to support them. Signed-off-by: Antoine Tenart Reviewed-by: Jisheng Zhang Signed-off-by: Sebastian Hesselbarth --- arch/arm/mach-berlin/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 9266ae38a5c1..95c098f497b5 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -1,5 +1,6 @@ config ARCH_BERLIN bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 + select ARCH_REQUIRE_GPIOLIB select ARM_GIC select GENERIC_IRQ_CHIP select DW_APB_ICTL From 03dac26a831c51e544dc95ba12ea9e3520829e7e Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Sun, 18 May 2014 20:06:32 +0200 Subject: [PATCH 4/4] ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs Signed-off-by: Antoine Tenart Acked-by: Sebastian Hesselbarth --- arch/arm/mach-berlin/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 95c098f497b5..101e0f356730 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -5,6 +5,7 @@ config ARCH_BERLIN select GENERIC_IRQ_CHIP select DW_APB_ICTL select DW_APB_TIMER_OF + select PINCTRL if ARCH_BERLIN @@ -15,16 +16,19 @@ config MACH_BERLIN_BG2 select CACHE_L2X0 select CPU_PJ4B select HAVE_ARM_TWD if SMP + select PINCTRL_BERLIN_BG2 config MACH_BERLIN_BG2CD bool "Marvell Armada 1500-mini (BG2CD)" select CACHE_L2X0 select HAVE_ARM_TWD if SMP + select PINCTRL_BERLIN_BG2CD config MACH_BERLIN_BG2Q bool "Marvell Armada 1500 Pro (BG2-Q)" select CACHE_L2X0 select HAVE_ARM_TWD if SMP + select PINCTRL_BERLIN_BG2Q endmenu