This patch enable configs for GPIOs found on
Freescale's LS1021A SOCs

It also makes mutual exclusion with ARCH_MXC,
since the GPIO controller on LS1020A SOC
is different from ARCH_MXC GPIO controllers

Signed-off-by: Shaveta Leekha <[email protected]>
---
Tested on Freescale SDK 1.8, as LS1021aQDS support is not yet complete in 
upstream

 drivers/gpio/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3a9dc1a..d933a77 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -290,10 +290,10 @@ config GPIO_MPC5200
 config GPIO_MPC8XXX
        bool "MPC512x/MPC8xxx GPIO support"
        depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
-                  FSL_SOC_BOOKE || PPC_86xx
+                  FSL_SOC_BOOKE || PPC_86xx || SOC_LS1021A
        help
          Say Y here if you're going to use hardware that connects to the
-         MPC512x/831x/834x/837x/8572/8610 GPIOs.
+         MPC512x/831x/834x/837x/8572/8610/LS1021A GPIOs.
 
 config GPIO_MSM_V2
        tristate "Qualcomm MSM GPIO v2"
@@ -311,7 +311,7 @@ config GPIO_MVEBU
 
 config GPIO_MXC
        def_bool y
-       depends on ARCH_MXC
+       depends on ARCH_MXC && !SOC_LS1021A
        select GPIO_GENERIC
        select GENERIC_IRQ_CHIP
 
-- 
1.7.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to