Merge commit 'kumar/kumar-next' into next

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 9578c45..47fe2be 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -239,7 +239,8 @@ config TAU_AVERAGE
          If in doubt, say N here.
 
 config QUICC_ENGINE
-       bool
+       bool "Freescale QUICC Engine (QE) Support"
+       depends on FSL_SOC
        select PPC_LIB_RHEAP
        select CRC32
        help
@@ -248,6 +249,15 @@ config QUICC_ENGINE
          Selecting this option means that you wish to build a kernel
          for a machine with a QE coprocessor.
 
+config QE_GPIO
+       bool "QE GPIO support"
+       depends on QUICC_ENGINE
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
+       help
+         Say Y here if you're going to use hardware that connects to the
+         QE GPIOs.
+
 config CPM2
        bool "Enable support for the CPM2 (Communications Processor Module)"
        depends on MPC85xx || 8260
@@ -302,4 +312,15 @@ config MPC8xxx_GPIO
          Say Y here if you're going to use hardware that connects to the
          MPC831x/834x/837x/8572/8610 GPIOs.
 
+config SIMPLE_GPIO
+       bool "Support for simple, memory-mapped GPIO controllers"
+       depends on PPC
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
+       help
+         Say Y here to support simple, memory-mapped GPIO controllers.
+         These are usually BCSRs used to control board's switches, LEDs,
+         chip-selects, Ethernet/USB PHY's power and various other small
+         on-board peripherals.
+
 endmenu