Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-integrator / Kconfig

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index abeff25532abce23869a8f5f268cf47545283160..ba43321001d8a5dd95275f31634c61cdd47798d7 100644 (file)
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -6,8 +6,8 @@ config ARCH_INTEGRATOR_AP
        bool "Support Integrator/AP and Integrator/PP2 platforms"
        select CLKSRC_MMIO
        select MIGHT_HAVE_PCI
-       select SERIAL_AMBA_PL010
-       select SERIAL_AMBA_PL010_CONSOLE
+       select SERIAL_AMBA_PL010 if TTY
+       select SERIAL_AMBA_PL010_CONSOLE if TTY
        select SOC_BUS
        help
          Include support for the ARM(R) Integrator/AP and
@@ -18,8 +18,8 @@ config ARCH_INTEGRATOR_CP
        select ARCH_CINTEGRATOR
        select ARM_TIMER_SP804
        select PLAT_VERSATILE_CLCD
-       select SERIAL_AMBA_PL011
-       select SERIAL_AMBA_PL011_CONSOLE
+       select SERIAL_AMBA_PL011 if TTY
+       select SERIAL_AMBA_PL011_CONSOLE if TTY
        select SOC_BUS
        help
          Include support for the ARM(R) Integrator CP platform.
@@ -30,6 +30,9 @@ config ARCH_CINTEGRATOR
 config INTEGRATOR_IMPD1
        tristate "Include support for Integrator/IM-PD1"
        depends on ARCH_INTEGRATOR_AP
+       select ARCH_REQUIRE_GPIOLIB
+       select ARM_VIC
+       select GPIO_PL061 if GPIOLIB
        help
          The IM-PD1 is an add-on logic module for the Integrator which
          allows ARM(R) Ltd PrimeCells to be developed and evaluated.