From 9d5d96ef2c3cb6da6eec7dd9d107ea63781368a0 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 28 Apr 2014 11:07:03 +0200 Subject: [PATCH] gpio: always enable GPIO_OMAP on ARCH_OMAP Commit 4df42de9d3e "gpio: omap: add a GPIO_OMAP option instead of using ARCH_OMAP" made it possible to build OMAP kernels without the GPIO driver, which at least on OMAP2 and OMAP3 causes build errors because of functions used by the platform power management code: arch/arm/mach-omap2/built-in.o: In function `omap_sram_idle': arch/arm/mach-omap2/pm24xx.c:129: undefined reference to `omap2_gpio_prepare_for_idle' arch/arm/mach-omap2/pm24xx.c:129: undefined reference to `omap2_gpio_resume_after_idle' We presumably always want the GPIO driver on OMAP, so this adds a slightly broader dependency and only allows disabling the driver only when no OMAP2PLUS platform is selected. However, it seems entirely reasonable to include the driver in build tests on other platforms, so we should also allow building it for COMPILE_TEST builds and select the required GENERIC_IRQ_CHIP that may not already be enabled on other platforms. Signed-off-by: Arnd Bergmann Acked-by: Javier Martinez Canillas Signed-off-by: Linus Walleij --- drivers/gpio/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index c58b828e..664df4d 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -244,9 +244,10 @@ config GPIO_OCTEON family of SOCs. config GPIO_OMAP - bool "TI OMAP GPIO support" + bool "TI OMAP GPIO support" if COMPILE_TEST && !ARCH_OMAP2PLUS default y if ARCH_OMAP - depends on ARM && ARCH_OMAP + depends on ARM + select GENERIC_IRQ_CHIP select GPIOLIB_IRQCHIP help Say yes here to enable GPIO support for TI OMAP SoCs. -- 2.7.4