| Message ID | 1337816857-14694-4-git-send-email-thomas.abraham@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Thu, 24 May 2012 05:17:37 +0530, Thomas Abraham <thomas.abraham@linaro.org> wrote: > Pinctrl driver, when enabled, registers all the gpio pins and hence the > registration of gpio pins by this driver can be skipped. > > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > drivers/gpio/gpio-samsung.c | 21 +++++++++++++++++++++ > 1 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c > index 19d6fc0..34a9638 100644 > --- a/drivers/gpio/gpio-samsung.c > +++ b/drivers/gpio/gpio-samsung.c > @@ -2788,6 +2788,27 @@ static __init int samsung_gpiolib_init(void) > #ifdef CONFIG_CPU_EXYNOS4210 > void __iomem *gpx_base; > > +#ifdef CONFIG_OF > + /* > + * This gpio driver includes support for device tree support and > + * there are platforms using it. In order to maintain > + * compatibility with those platforms, and to allow non-dt > + * Exynos4210 platforms to use this gpiolib support, a check > + * is added to find out if there is a active pin-controller > + * driver support available. If it is available, this gpiolib > + * support is ignored and the gpiolib support available in > + * pin-controller driver is used. This is a temporary check and > + * will go away when all of the Exynos4210 platforms have > + * switched to using device tree and the pin-ctrl driver. > + */ > + struct device_node *pctrl_np; > + const char *pctrl_compat = "samsung,pinctrl-exynos4210"; > + pctrl_np = of_find_compatible_node(NULL, NULL, pctrl_compat); > + if (pctrl_np) > + if (of_device_is_available(pctrl_np)) > + return -ENODEV; > +#endif > + > /* gpio part1 */ > gpio_base1 = ioremap(EXYNOS4_PA_GPIO1, SZ_4K); > if (gpio_base1 == NULL) { > -- > 1.6.6.rc2 >
On Thu, May 24, 2012 at 1:47 AM, Thomas Abraham <thomas.abraham@linaro.org> wrote: > Pinctrl driver, when enabled, registers all the gpio pins and hence the > registration of gpio pins by this driver can be skipped. > > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> I guess it's already applied... sorry for taking so long time to respond. Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 19d6fc0..34a9638 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -2788,6 +2788,27 @@ static __init int samsung_gpiolib_init(void) #ifdef CONFIG_CPU_EXYNOS4210 void __iomem *gpx_base; +#ifdef CONFIG_OF + /* + * This gpio driver includes support for device tree support and + * there are platforms using it. In order to maintain + * compatibility with those platforms, and to allow non-dt + * Exynos4210 platforms to use this gpiolib support, a check + * is added to find out if there is a active pin-controller + * driver support available. If it is available, this gpiolib + * support is ignored and the gpiolib support available in + * pin-controller driver is used. This is a temporary check and + * will go away when all of the Exynos4210 platforms have + * switched to using device tree and the pin-ctrl driver. + */ + struct device_node *pctrl_np; + const char *pctrl_compat = "samsung,pinctrl-exynos4210"; + pctrl_np = of_find_compatible_node(NULL, NULL, pctrl_compat); + if (pctrl_np) + if (of_device_is_available(pctrl_np)) + return -ENODEV; +#endif + /* gpio part1 */ gpio_base1 = ioremap(EXYNOS4_PA_GPIO1, SZ_4K); if (gpio_base1 == NULL) {
Pinctrl driver, when enabled, registers all the gpio pins and hence the registration of gpio pins by this driver can be skipped. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> --- drivers/gpio/gpio-samsung.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-)