[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options
Heiko Stübner
heiko at sntech.de
Thu Jun 13 18:45:27 EDT 2013
When a pinctrl driver is loaded legacy gpio support has to be disabled.
The code checking for the pinctrl presence is contained in an #ifdef
checking for the presence of a valid samsung pinctrl driver.
There the new PINCTRL_S3C24XX was missing resulting in the check never
being run and the gpio being enabled breaking the pinctrl driver.
Fix this by adding the missing CONFIG_PINCTRL_S3C24XX
Signed-off-by: Heiko Stuebner <heiko at sntech.de>
---
drivers/gpio/gpio-samsung.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index a1392f4..c84503e 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2949,7 +2949,8 @@ static __init int samsung_gpiolib_init(void)
int i, nr_chips;
int group = 0;
-#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
+#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) || \
+ defined(CONFIG_PINCTRL_S3C24XX)
/*
* This gpio driver includes support for device tree support and there
* are platforms using it. In order to maintain compatibility with those
--
1.7.10.4
More information about the linux-arm-kernel
mailing list