| Message ID | 1363642315-10331-3-git-send-email-tomasz.figa@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday 18 of March 2013 22:31:51 Tomasz Figa wrote: > Since pinctrl-samsung is a common part of the pin control support for > several Samsung SoCs, it can be compiled without Exynos support enabled. > > This patch surrounds Exynos-specific driver data with ifdefs to include > them only when support for Exynos is enabled. > > Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> > --- > drivers/pinctrl/pinctrl-samsung.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/pinctrl/pinctrl-samsung.c > b/drivers/pinctrl/pinctrl-samsung.c index b1d4ac8..f1fb562 100644 > --- a/drivers/pinctrl/pinctrl-samsung.c > +++ b/drivers/pinctrl/pinctrl-samsung.c > @@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct > platform_device *pdev) } > > static const struct of_device_id samsung_pinctrl_dt_match[] = { > +#ifdef CONFIG_PINCTRL_EXYNOS4 Oops... This should be CONFIG_PINCTRL_EXYNOS. It used to be EXYNOS4 in Kgene's tree (on which I usually base my patches) for some time, but it no longer is, but I forgot to change this during rebae. Linus, if remaining patches turned out to be OK, would you fix this when applying? Best regards, Tomasz -- 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, Mar 18, 2013 at 10:38 PM, Tomasz Figa <tomasz.figa@gmail.com> wrote: > On Monday 18 of March 2013 22:31:51 Tomasz Figa wrote: >> Since pinctrl-samsung is a common part of the pin control support for >> several Samsung SoCs, it can be compiled without Exynos support enabled. >> >> This patch surrounds Exynos-specific driver data with ifdefs to include >> them only when support for Exynos is enabled. >> >> Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> >> --- >> drivers/pinctrl/pinctrl-samsung.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/drivers/pinctrl/pinctrl-samsung.c >> b/drivers/pinctrl/pinctrl-samsung.c index b1d4ac8..f1fb562 100644 >> --- a/drivers/pinctrl/pinctrl-samsung.c >> +++ b/drivers/pinctrl/pinctrl-samsung.c >> @@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct >> platform_device *pdev) } >> >> static const struct of_device_id samsung_pinctrl_dt_match[] = { >> +#ifdef CONFIG_PINCTRL_EXYNOS4 > > Oops... This should be CONFIG_PINCTRL_EXYNOS. It used to be EXYNOS4 in > Kgene's tree (on which I usually base my patches) for some time, but it no > longer is, but I forgot to change this during rebae. > > Linus, if remaining patches turned out to be OK, would you fix this when > applying? Fixed and applied. Thanks! 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/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index b1d4ac8..f1fb562 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) } static const struct of_device_id samsung_pinctrl_dt_match[] = { +#ifdef CONFIG_PINCTRL_EXYNOS4 { .compatible = "samsung,exynos4210-pinctrl", .data = (void *)exynos4210_pin_ctrl }, { .compatible = "samsung,exynos4x12-pinctrl", .data = (void *)exynos4x12_pin_ctrl }, +#endif {}, }; MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);
Since pinctrl-samsung is a common part of the pin control support for several Samsung SoCs, it can be compiled without Exynos support enabled. This patch surrounds Exynos-specific driver data with ifdefs to include them only when support for Exynos is enabled. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> --- drivers/pinctrl/pinctrl-samsung.c | 2 ++ 1 file changed, 2 insertions(+)