public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: heiko@sntech•de (Heiko Stübner)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options
Date: Fri, 14 Jun 2013 00:45:27 +0200	[thread overview]
Message-ID: <201306140045.27744.heiko@sntech.de> (raw)
In-Reply-To: <201306140044.15568.heiko@sntech.de>

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@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

  reply	other threads:[~2013-06-13 22:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-13 22:44 [PATCH 0/3] ARM: S3C24XX: s3c2416 build fixes Heiko Stübner
2013-06-13 22:45 ` Heiko Stübner [this message]
2013-06-17 13:13   ` [PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options Kukjin Kim
2013-06-17 16:49     ` Linus Walleij
2013-06-17 13:19   ` Tomasz Figa
2013-06-17 15:43     ` Kukjin Kim
2013-06-17 15:48       ` Tomasz Figa
2013-06-13 22:45 ` [PATCH 2/3] pinctrl: s3c24xx: use correct header for chained_irq functions Heiko Stübner
2013-06-17 13:16   ` Kukjin Kim
2013-06-17 15:45     ` Linus Walleij
2013-06-17 15:58       ` Kukjin Kim
2013-06-13 22:46 ` [PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata Heiko Stübner
2013-06-18 17:39   ` Kukjin Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201306140045.27744.heiko@sntech.de \
    --to=heiko@sntech$(echo .)de \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox