2 files changed, 15 insertions, 0 deletions

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
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index b0cb0722acd2..101e0f356730 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -1,9 +1,11 @@
 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
         select DW_APB_TIMER_OF
+        select PINCTRL
 
 if ARCH_BERLIN
 
@@ -14,11 +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