Message ID | 201306140045.27744.heiko@sntech.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Heiko Stübner wrote: > > 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 Yeah, this is needed :-) Linus, shall I take this into samsung tree? Or since the pinctrl-s3c24xx already merged into arm-soc, this could be picked into your tree... Thanks, - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Heiko, On Friday 14 of June 2013 00:45:27 Heiko Stübner wrote: > 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) I wonder if this wouldn't be simply covered by PINCTRL_SAMSUNG (except PINCTRL_EXYNOS5440 which doesn't use the common part). Best regards, Tomasz > /* > * This gpio driver includes support for device tree support and there > * are platforms using it. In order to maintain compatibility with those -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/17/13 22:19, Tomasz Figa wrote: > Hi Heiko, > > On Friday 14 of June 2013 00:45:27 Heiko Stübner wrote: >> 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) > > I wonder if this wouldn't be simply covered by PINCTRL_SAMSUNG (except > PINCTRL_EXYNOS5440 which doesn't use the common part). > Well, not added compatible for 's3c64xx-pinctrl' yet? - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 18 of June 2013 00:43:41 Kukjin Kim wrote: > On 06/17/13 22:19, Tomasz Figa wrote: > > Hi Heiko, > > > > On Friday 14 of June 2013 00:45:27 Heiko Stübner wrote: > >> 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) > > > > I wonder if this wouldn't be simply covered by PINCTRL_SAMSUNG (except > > PINCTRL_EXYNOS5440 which doesn't use the common part). > > Well, not added compatible for 's3c64xx-pinctrl' yet? Right, but this shouldn't have any effect on this code. PINCTRL_S3C64XX isn't selected by anything yet, so PINCTRL_SAMSUNG won't be selected when ARCH_S3C64XX is used. As for s3c64xx DT support, I'm planning to finally post patches this week. Best regards, Tomasz > - Kukjin > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 17, 2013 at 3:13 PM, Kukjin Kim <kgene.kim@samsung.com> wrote: > Linus, shall I take this into samsung tree? Or since the pinctrl-s3c24xx already merged into arm-soc, this could be picked into your tree... I'm not rebasing pinctrl agains the ARM SoC tree, I only rebase to Torvalds tree. So please take it through the Samsung tree... Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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(-)