| Message ID | 1398545.9FqHoC0WZW@flatron (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 17, 2013 at 12:24 AM, Tomasz Figa <tomasz.figa@gmail.com> wrote: > Commit f67faf487 added driver data for Exynos5250, which is available > only if CONFIG_PINCTRL_EXYNOS is enabled. However probably due to merge > error, the reference to this driver data structure was located outside > of relevant ifdef and compiled unconditionally, leading to link error > with CONFIG_PINCTRL_EXYNOS. > > This patch fixes mentioned link error by moving driver data entry under > ifdef CONFIG_PINCTRL_EXYNOS. > > Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> This does not apply to my "devel" branch in the pinctrl tree. Could you rebase it on that branch? Or is the error not even in my tree? 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
Hi Linus, On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote: > On Wed, Apr 17, 2013 at 12:24 AM, Tomasz Figa <tomasz.figa@gmail.com> wrote: > > Commit f67faf487 added driver data for Exynos5250, which is available > > only if CONFIG_PINCTRL_EXYNOS is enabled. However probably due to merge > > error, the reference to this driver data structure was located outside > > of relevant ifdef and compiled unconditionally, leading to link error > > with CONFIG_PINCTRL_EXYNOS. > > > > This patch fixes mentioned link error by moving driver data entry under > > ifdef CONFIG_PINCTRL_EXYNOS. > > > > Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> > > This does not apply to my "devel" branch in the pinctrl tree. > > Could you rebase it on that branch? > > Or is the error not even in my tree? This one got sent incorrectly due to my mistake. Please try the correct version: [PATCH RESEND 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled Best regards,
On Tue, Apr 23, 2013 at 2:09 PM, Tomasz Figa <t.figa@samsung.com> wrote: > On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote: >> This does not apply to my "devel" branch in the pinctrl tree. >> >> Could you rebase it on that branch? >> >> Or is the error not even in my tree? > > This one got sent incorrectly due to my mistake. Please try the correct > version: > > [PATCH RESEND 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS > disabled This does not apply either. Can you please test against the "devel" branch in the pinctrl tree? 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
On Wednesday 24 of April 2013 16:27:09 Linus Walleij wrote: > On Tue, Apr 23, 2013 at 2:09 PM, Tomasz Figa <t.figa@samsung.com> wrote: > > On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote: > >> This does not apply to my "devel" branch in the pinctrl tree. > >> > >> Could you rebase it on that branch? > >> > >> Or is the error not even in my tree? > > > > This one got sent incorrectly due to my mistake. Please try the correct > > version: > > > > [PATCH RESEND 2/2] pinctrl: samsung: Fix link error with > > CONFIG_PINCTRL_EXYNOS disabled > > This does not apply either. > > Can you please test against the "devel" branch in the pinctrl tree? Right, it does not apply. Well, actually it does with git am -3, but it is incorrect, since the problem it intends to fix is not present in your tree, but rather is a merge error in linux-next in a merge of Kgene's and your tree... Best regards,
On Wed, Apr 24, 2013 at 4:47 PM, Tomasz Figa <t.figa@samsung.com> wrote: > On Wednesday 24 of April 2013 16:27:09 Linus Walleij wrote: >> On Tue, Apr 23, 2013 at 2:09 PM, Tomasz Figa <t.figa@samsung.com> wrote: >> > On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote: >> >> This does not apply to my "devel" branch in the pinctrl tree. >> >> >> >> Could you rebase it on that branch? >> >> >> >> Or is the error not even in my tree? >> > >> > This one got sent incorrectly due to my mistake. Please try the correct >> > version: >> > >> > [PATCH RESEND 2/2] pinctrl: samsung: Fix link error with >> > CONFIG_PINCTRL_EXYNOS disabled >> >> This does not apply either. >> >> Can you please test against the "devel" branch in the pinctrl tree? > > Right, it does not apply. > > Well, actually it does with git am -3, but it is incorrect, since the problem > it intends to fix is not present in your tree, but rather is a merge error in > linux-next in a merge of Kgene's and your tree... Oh. Then you have to send the patch to Stephen Rothwell. 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/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl- samsung.c index f95dd69..9763668 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -970,13 +970,13 @@ static const struct of_device_id samsung_pinctrl_dt_match[] = { .data = (void *)exynos4210_pin_ctrl }, { .compatible = "samsung,exynos4x12-pinctrl", .data = (void *)exynos4x12_pin_ctrl }, + { .compatible = "samsung,exynos5250-pinctrl", + .data = (void *)exynos5250_pin_ctrl }, #endif #ifdef CONFIG_PINCTRL_S3C64XX { .compatible = "samsung,s3c64xx-pinctrl", .data = s3c64xx_pin_ctrl }, #endif - { .compatible = "samsung,exynos5250-pinctrl", - .data = (void *)exynos5250_pin_ctrl }, {}, };
Commit f67faf487 added driver data for Exynos5250, which is available only if CONFIG_PINCTRL_EXYNOS is enabled. However probably due to merge error, the reference to this driver data structure was located outside of relevant ifdef and compiled unconditionally, leading to link error with CONFIG_PINCTRL_EXYNOS. This patch fixes mentioned link error by moving driver data entry under ifdef CONFIG_PINCTRL_EXYNOS. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> --- drivers/pinctrl/pinctrl-samsung.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);