Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin into next/soc

Merge "ARM: berlin: SoC changes for v3.16" from Sebastian Hesselbart:

Despite relatively young Berlin SoC support, we already have support
for a BG2Q SoC provided by Alexandre Belloni and Antoine Tenart. Also,
we gained support for DW gpio and a pinctrl driver.

* tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin:
  ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs
  ARM: berlin: add the LIBGPIO as a dependency for the BG2Q
  ARM: berlin: add MACH_BERLIN_BG2Q symbol
  ARM: berlin: add Marvell Armada 1500 pro to Marvell doc

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 11 years ago
parent
2ca602de42 03dac26a83
commit
e469d6ba0a
2 changed files with 15 additions and 0 deletions
Unified View Show Diff Stats
  1. 5 0
      Documentation/arm/Marvell/README
  2. 10 0
      arch/arm/mach-berlin/Kconfig

+ 5 - 0
Documentation/arm/Marvell/README
View File 

@@ -234,6 +234,11 @@ Berlin family (Digital Entertainment)
 
 		Core:		Marvell PJ4B (ARMv7), Tauros3 L2CC
 
 		Core:		Marvell PJ4B (ARMv7), Tauros3 L2CC
 
 		Homepage:	http://www.marvell.com/digital-entertainment/armada-1500/
 
 		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
 
 		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????
 
 	88DE????
 
 		Design name:	BG3
 
 		Design name:	BG3
 
 		Core:		ARM Cortex-A15, CA15 integrated L2CC
 
 		Core:		ARM Cortex-A15, CA15 integrated L2CC

+ 10 - 0
arch/arm/mach-berlin/Kconfig
View File 

@@ -1,9 +1,11 @@
 
 config ARCH_BERLIN
 
 config ARCH_BERLIN
 
 	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
 
 	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
 
+	select ARCH_REQUIRE_GPIOLIB
 
 	select ARM_GIC
 
 	select ARM_GIC
 
 	select GENERIC_IRQ_CHIP
 
 	select GENERIC_IRQ_CHIP
 
 	select DW_APB_ICTL
 
 	select DW_APB_ICTL
 
 	select DW_APB_TIMER_OF
 
 	select DW_APB_TIMER_OF
 
+	select PINCTRL
 
 
 
 if ARCH_BERLIN
 
 if ARCH_BERLIN
 
 
 
@@ -14,11 +16,19 @@ config MACH_BERLIN_BG2
 
 	select CACHE_L2X0
 
 	select CACHE_L2X0
 
 	select CPU_PJ4B
 
 	select CPU_PJ4B
 
 	select HAVE_ARM_TWD if SMP
 
 	select HAVE_ARM_TWD if SMP
 
+	select PINCTRL_BERLIN_BG2
 
 
 
 config MACH_BERLIN_BG2CD
 
 config MACH_BERLIN_BG2CD
 
 	bool "Marvell Armada 1500-mini (BG2CD)"
 
 	bool "Marvell Armada 1500-mini (BG2CD)"
 
 	select CACHE_L2X0
 
 	select CACHE_L2X0
 
 	select HAVE_ARM_TWD if SMP
 
 	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
 
 endmenu