| Message ID | 20170428200824.10906-6-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 28, 2017 at 10:08 PM, Paul Cercueil <paul@crapouillou.net> wrote: > There is a pinctrl driver for each of the Ingenic SoCs supported by the > upstream Linux kernel. In order to switch away from the old GPIO > platform code, we now enable the pinctrl drivers by default for the > Ingenic SoCs. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > arch/mips/Kconfig | 1 + So please tell me your desired merge strategy for these bits. I can provide an immutable branch for pinctrl if you want to pull the deps in or we can just merge this orthogonally in the MIPS tree and let things smoothen together in the merge window. This goes for everything outside of pinctrl/gpio. If I should merge patches for other subsystems I need ACKs from the maintainers of MIPS etc. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 11/05/2017 13:08, Linus Walleij wrote: > On Fri, Apr 28, 2017 at 10:08 PM, Paul Cercueil <paul@crapouillou.net> wrote: > >> There is a pinctrl driver for each of the Ingenic SoCs supported by the >> upstream Linux kernel. In order to switch away from the old GPIO >> platform code, we now enable the pinctrl drivers by default for the >> Ingenic SoCs. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> --- >> arch/mips/Kconfig | 1 + > So please tell me your desired merge strategy for these bits. I can > provide an immutable branch for pinctrl if you want to pull the deps in > or we can just merge this orthogonally in the MIPS tree and let things > smoothen together in the merge window. > > This goes for everything outside of pinctrl/gpio. > > If I should merge patches for other subsystems I need ACKs from > the maintainers of MIPS etc. > > Yours, > Linus Walleij > It is very unlikely that those patches will cause merge failures if you merge it in your tree, these drivers are touched very rarely; so I'd say you can merge them. But to be sure I'd like Ralf's input on that. Regards, -Paul -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Apr 28, 2017 at 10:08 PM, Paul Cercueil <paul@crapouillou.net> wrote: > There is a pinctrl driver for each of the Ingenic SoCs supported by the > upstream Linux kernel. In order to switch away from the old GPIO > platform code, we now enable the pinctrl drivers by default for the > Ingenic SoCs. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> I applied all the patches to a branch in pinctrl and merged into my devel branch for testing: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/ Branch: ingenic Ralf: are you OK with this? It would be nice to have your ACK on all patches. If you want you can pull this branch into the MIPS tree, or we can hope for it all to settle nicely because of low platform activity in MIPS on this platform, so it only needs to come in from my trees. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Linus, > I applied all the patches to a branch in pinctrl and merged into my > devel branch for testing: > > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/ > Branch: ingenic > > Ralf: are you OK with this? It would be nice to have your ACK on > all patches. If you want you can pull this branch into the MIPS > tree, or we can hope for it all to settle nicely because of low > platform > activity in MIPS on this platform, so it only needs to come in > from my trees. There has been no word from Ralf, is this going into 4.13? -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Jul 2, 2017 at 6:35 PM, Paul Cercueil <paul@crapouillou.net> wrote: > Hi Linus, > >> I applied all the patches to a branch in pinctrl and merged into my >> devel branch for testing: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/ >> Branch: ingenic >> >> Ralf: are you OK with this? It would be nice to have your ACK on >> all patches. If you want you can pull this branch into the MIPS >> tree, or we can hope for it all to settle nicely because of low platform >> activity in MIPS on this platform, so it only needs to come in >> from my trees. > > > There has been no word from Ralf, is this going into 4.13? Yes. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 03, 2017 at 11:07:09AM +0200, Linus Walleij wrote: > > There has been no word from Ralf, is this going into 4.13? Acked-by: Ralf Baechle <ralf@linux-mips.org> for the whole series. Thanks, Ralf -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 3, 2017 at 3:55 PM, Ralf Baechle <ralf@linux-mips.org> wrote: > On Mon, Jul 03, 2017 at 11:07:09AM +0200, Linus Walleij wrote: > >> > There has been no word from Ralf, is this going into 4.13? > > Acked-by: Ralf Baechle <ralf@linux-mips.org> > > for the whole series. Thanks Ralf, I missed to add this in, but everything seems to have landed smoothly in v4.13. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" 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/arch/mips/Kconfig b/arch/mips/Kconfig index e0bb576410bb..771995b75e0d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -363,6 +363,7 @@ config MACH_INGENIC select SYS_SUPPORTS_ZBOOT_UART16550 select DMA_NONCOHERENT select IRQ_MIPS_CPU + select PINCTRL select GPIOLIB select COMMON_CLK select GENERIC_IRQ_CHIP
There is a pinctrl driver for each of the Ingenic SoCs supported by the upstream Linux kernel. In order to switch away from the old GPIO platform code, we now enable the pinctrl drivers by default for the Ingenic SoCs. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+) v2: No changes v3: No changes v4: No changes v5: No changes