| Message ID | 1430216072-31412-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Tue, Apr 28, 2015 at 12:14:31PM +0200, Geert Uytterhoeven wrote: > As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove > legacy platform"), r8a73a4 is only supported in generic ARM > multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, > and the check can be removed. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1 Which was tagged as renesas-r8a73a4-ccf-and-multiplatform-for-v4.1 and is present in v4.0-rc1. Acked-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c > index 280a56f977860272..ba18d2e65e674563 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c > @@ -21,10 +21,6 @@ > #include <linux/kernel.h> > #include <linux/pinctrl/pinconf-generic.h> > > -#ifndef CONFIG_ARCH_MULTIPLATFORM > -#include <mach/irqs.h> > -#endif > - > #include "core.h" > #include "sh_pfc.h" > > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" 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-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove > legacy platform"), r8a73a4 is only supported in generic ARM > multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, > and the check can be removed. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1 I guess I can't merge it to pinctrl then and Simon will take it? Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, May 12, 2015 at 9:26 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven > <geert+renesas@glider.be> wrote: > >> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove >> legacy platform"), r8a73a4 is only supported in generic ARM >> multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, >> and the check can be removed. >> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1 > I guess I can't merge it to pinctrl then and Simon will take it? Sorry for the confusion, that was a old comment I forgot to remove, as that branch was already upstream. The comment was no longer there in the updated version, sent 1 minute later. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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 Tue, May 12, 2015 at 09:26:53AM +0200, Linus Walleij wrote: > On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven > <geert+renesas@glider.be> wrote: > > > As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove > > legacy platform"), r8a73a4 is only supported in generic ARM > > multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, > > and the check can be removed. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > --- > > This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1 > > I guess I can't merge it to pinctrl then and Simon will take it? > > Acked-by: Linus Walleij <linus.walleij@linaro.org> I am happy to take this with your ack, however, the above mentioned branch is present in v4.1-rc1 so if it is practical for you to use that as a base then you can take the patch yourself. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 14, 2015 at 2:49 AM, Simon Horman <horms@verge.net.au> wrote: > Hi Linus, > > On Tue, May 12, 2015 at 09:26:53AM +0200, Linus Walleij wrote: >> On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven >> <geert+renesas@glider.be> wrote: >> >> > As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove >> > legacy platform"), r8a73a4 is only supported in generic ARM >> > multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, >> > and the check can be removed. >> > >> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> > --- >> > This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1 >> >> I guess I can't merge it to pinctrl then and Simon will take it? >> >> Acked-by: Linus Walleij <linus.walleij@linaro.org> > > I am happy to take this with your ack, however, the above mentioned branch > is present in v4.1-rc1 so if it is practical for you to use that as a base > then you can take the patch yourself. Yeah I took it. Thanks Simon. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c index 280a56f977860272..ba18d2e65e674563 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c @@ -21,10 +21,6 @@ #include <linux/kernel.h> #include <linux/pinctrl/pinconf-generic.h> -#ifndef CONFIG_ARCH_MULTIPLATFORM -#include <mach/irqs.h> -#endif - #include "core.h" #include "sh_pfc.h"
As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform"), r8a73a4 is only supported in generic ARM multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, and the check can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1 --- drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 ---- 1 file changed, 4 deletions(-)