* [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled @ 2014-05-08 13:36 Hans de Goede 2014-05-08 14:21 ` Maxime Ripard 0 siblings, 1 reply; 6+ messages in thread From: Hans de Goede @ 2014-05-08 13:36 UTC (permalink / raw) To: linux-arm-kernel The commit titled: "pinctrl: sunxi: Introduce per-driver Kconfig options" adds a bunch of new Kconfig options, but nothing sets them resulting in a non working kernel. Since they are per sunxi family, and we already have sunxi family Kconfig options, make those options select the necessary Kconfig options. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/mach-sunxi/Kconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 3aff966..beab32e 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -4,7 +4,6 @@ menuconfig ARCH_SUNXI select CLKSRC_MMIO select GENERIC_IRQ_CHIP select PINCTRL - select PINCTRL_SUNXI select SUN4I_TIMER if ARCH_SUNXI @@ -12,11 +11,14 @@ if ARCH_SUNXI config MACH_SUN4I bool "Allwinner A10 (sun4i) SoCs support" default ARCH_SUNXI + select PINCTRL_SUN4I_A10 config MACH_SUN5I bool "Allwinner A10s / A13 (sun5i) SoCs support" default ARCH_SUNXI select SUN5I_HSTIMER + select PINCTRL_SUN5I_A10S + select PINCTRL_SUN5I_A13 config MACH_SUN6I bool "Allwinner A31 (sun6i) SoCs support" @@ -25,6 +27,7 @@ config MACH_SUN6I select ARM_GIC select RESET_CONTROLLER select SUN5I_HSTIMER + select PINCTRL_SUN6I_A31 config MACH_SUN7I bool "Allwinner A20 (sun7i) SoCs support" @@ -33,5 +36,6 @@ config MACH_SUN7I select ARM_PSCI select HAVE_ARM_ARCH_TIMER select SUN5I_HSTIMER + select PINCTRL_SUN7I_A20 endif -- 1.9.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled 2014-05-08 13:36 [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled Hans de Goede @ 2014-05-08 14:21 ` Maxime Ripard 2014-05-08 14:35 ` Hans de Goede 2014-05-08 21:56 ` Linus Walleij 0 siblings, 2 replies; 6+ messages in thread From: Maxime Ripard @ 2014-05-08 14:21 UTC (permalink / raw) To: linux-arm-kernel Hi Hans, On Thu, May 08, 2014 at 03:36:56PM +0200, Hans de Goede wrote: > The commit titled: "pinctrl: sunxi: Introduce per-driver Kconfig options" > adds a bunch of new Kconfig options, but nothing sets them resulting in a > non working kernel. Since they are per sunxi family, and we already have > sunxi family Kconfig options, make those options select the necessary > Kconfig options. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > arch/arm/mach-sunxi/Kconfig | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > index 3aff966..beab32e 100644 > --- a/arch/arm/mach-sunxi/Kconfig > +++ b/arch/arm/mach-sunxi/Kconfig > @@ -4,7 +4,6 @@ menuconfig ARCH_SUNXI > select CLKSRC_MMIO > select GENERIC_IRQ_CHIP > select PINCTRL > - select PINCTRL_SUNXI > select SUN4I_TIMER > > if ARCH_SUNXI > @@ -12,11 +11,14 @@ if ARCH_SUNXI > config MACH_SUN4I > bool "Allwinner A10 (sun4i) SoCs support" > default ARCH_SUNXI > + select PINCTRL_SUN4I_A10 > > config MACH_SUN5I > bool "Allwinner A10s / A13 (sun5i) SoCs support" > default ARCH_SUNXI > select SUN5I_HSTIMER > + select PINCTRL_SUN5I_A10S > + select PINCTRL_SUN5I_A13 > > config MACH_SUN6I > bool "Allwinner A31 (sun6i) SoCs support" > @@ -25,6 +27,7 @@ config MACH_SUN6I > select ARM_GIC > select RESET_CONTROLLER > select SUN5I_HSTIMER > + select PINCTRL_SUN6I_A31 > > config MACH_SUN7I > bool "Allwinner A20 (sun7i) SoCs support" > @@ -33,5 +36,6 @@ config MACH_SUN7I > select ARM_PSCI > select HAVE_ARM_ARCH_TIMER > select SUN5I_HSTIMER > + select PINCTRL_SUN7I_A20 > > endif I already posted a similar patch that is still pending. I was only waiting for Linus to merge the branch I gave him to merge it in my tree. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/251704.html I don't think he actually merged the branch yet. How did you encounter such breakage? Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140508/3920d05f/attachment.sig> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled 2014-05-08 14:21 ` Maxime Ripard @ 2014-05-08 14:35 ` Hans de Goede 2014-05-08 15:36 ` Maxime Ripard 2014-05-08 21:56 ` Linus Walleij 1 sibling, 1 reply; 6+ messages in thread From: Hans de Goede @ 2014-05-08 14:35 UTC (permalink / raw) To: linux-arm-kernel Hi, On 05/08/2014 04:21 PM, Maxime Ripard wrote: > Hi Hans, > > On Thu, May 08, 2014 at 03:36:56PM +0200, Hans de Goede wrote: >> The commit titled: "pinctrl: sunxi: Introduce per-driver Kconfig options" >> adds a bunch of new Kconfig options, but nothing sets them resulting in a >> non working kernel. Since they are per sunxi family, and we already have >> sunxi family Kconfig options, make those options select the necessary >> Kconfig options. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> arch/arm/mach-sunxi/Kconfig | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig >> index 3aff966..beab32e 100644 >> --- a/arch/arm/mach-sunxi/Kconfig >> +++ b/arch/arm/mach-sunxi/Kconfig >> @@ -4,7 +4,6 @@ menuconfig ARCH_SUNXI >> select CLKSRC_MMIO >> select GENERIC_IRQ_CHIP >> select PINCTRL >> - select PINCTRL_SUNXI >> select SUN4I_TIMER >> >> if ARCH_SUNXI >> @@ -12,11 +11,14 @@ if ARCH_SUNXI >> config MACH_SUN4I >> bool "Allwinner A10 (sun4i) SoCs support" >> default ARCH_SUNXI >> + select PINCTRL_SUN4I_A10 >> >> config MACH_SUN5I >> bool "Allwinner A10s / A13 (sun5i) SoCs support" >> default ARCH_SUNXI >> select SUN5I_HSTIMER >> + select PINCTRL_SUN5I_A10S >> + select PINCTRL_SUN5I_A13 >> >> config MACH_SUN6I >> bool "Allwinner A31 (sun6i) SoCs support" >> @@ -25,6 +27,7 @@ config MACH_SUN6I >> select ARM_GIC >> select RESET_CONTROLLER >> select SUN5I_HSTIMER >> + select PINCTRL_SUN6I_A31 >> >> config MACH_SUN7I >> bool "Allwinner A20 (sun7i) SoCs support" >> @@ -33,5 +36,6 @@ config MACH_SUN7I >> select ARM_PSCI >> select HAVE_ARM_ARCH_TIMER >> select SUN5I_HSTIMER >> + select PINCTRL_SUN7I_A20 >> >> endif > > I already posted a similar patch that is still pending. I was only > waiting for Linus to merge the branch I gave him to merge it in my > tree. > > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/251704.html > > I don't think he actually merged the branch yet. How did you > encounter such breakage? I've been sucking up various branches and posted patches for the next sunxi-devel, including your sunxi/pinctrl-for-3.16 branch. Regards, Hans ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled 2014-05-08 14:35 ` Hans de Goede @ 2014-05-08 15:36 ` Maxime Ripard 0 siblings, 0 replies; 6+ messages in thread From: Maxime Ripard @ 2014-05-08 15:36 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 08, 2014 at 04:35:29PM +0200, Hans de Goede wrote: > Hi, > > On 05/08/2014 04:21 PM, Maxime Ripard wrote: > > Hi Hans, > > > > On Thu, May 08, 2014 at 03:36:56PM +0200, Hans de Goede wrote: > >> The commit titled: "pinctrl: sunxi: Introduce per-driver Kconfig options" > >> adds a bunch of new Kconfig options, but nothing sets them resulting in a > >> non working kernel. Since they are per sunxi family, and we already have > >> sunxi family Kconfig options, make those options select the necessary > >> Kconfig options. > >> > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > >> --- > >> arch/arm/mach-sunxi/Kconfig | 6 +++++- > >> 1 file changed, 5 insertions(+), 1 deletion(-) > >> > >> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > >> index 3aff966..beab32e 100644 > >> --- a/arch/arm/mach-sunxi/Kconfig > >> +++ b/arch/arm/mach-sunxi/Kconfig > >> @@ -4,7 +4,6 @@ menuconfig ARCH_SUNXI > >> select CLKSRC_MMIO > >> select GENERIC_IRQ_CHIP > >> select PINCTRL > >> - select PINCTRL_SUNXI > >> select SUN4I_TIMER > >> > >> if ARCH_SUNXI > >> @@ -12,11 +11,14 @@ if ARCH_SUNXI > >> config MACH_SUN4I > >> bool "Allwinner A10 (sun4i) SoCs support" > >> default ARCH_SUNXI > >> + select PINCTRL_SUN4I_A10 > >> > >> config MACH_SUN5I > >> bool "Allwinner A10s / A13 (sun5i) SoCs support" > >> default ARCH_SUNXI > >> select SUN5I_HSTIMER > >> + select PINCTRL_SUN5I_A10S > >> + select PINCTRL_SUN5I_A13 > >> > >> config MACH_SUN6I > >> bool "Allwinner A31 (sun6i) SoCs support" > >> @@ -25,6 +27,7 @@ config MACH_SUN6I > >> select ARM_GIC > >> select RESET_CONTROLLER > >> select SUN5I_HSTIMER > >> + select PINCTRL_SUN6I_A31 > >> > >> config MACH_SUN7I > >> bool "Allwinner A20 (sun7i) SoCs support" > >> @@ -33,5 +36,6 @@ config MACH_SUN7I > >> select ARM_PSCI > >> select HAVE_ARM_ARCH_TIMER > >> select SUN5I_HSTIMER > >> + select PINCTRL_SUN7I_A20 > >> > >> endif > > > > I already posted a similar patch that is still pending. I was only > > waiting for Linus to merge the branch I gave him to merge it in my > > tree. > > > > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/251704.html > > > > I don't think he actually merged the branch yet. How did you > > encounter such breakage? > > I've been sucking up various branches and posted patches for the next > sunxi-devel, including your sunxi/pinctrl-for-3.16 branch. Ok, so yes, you need such a patch :) -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140508/d57c0973/attachment.sig> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled 2014-05-08 14:21 ` Maxime Ripard 2014-05-08 14:35 ` Hans de Goede @ 2014-05-08 21:56 ` Linus Walleij 2014-05-09 0:41 ` [linux-sunxi] " Maxime Ripard 1 sibling, 1 reply; 6+ messages in thread From: Linus Walleij @ 2014-05-08 21:56 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 8, 2014 at 4:21 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > I already posted a similar patch that is still pending. I was only > waiting for Linus to merge the branch I gave him to merge it in my > tree. I haven't recieved a branch :-( I don't know if the error is on my side ... I only have a mail stating you will send a pull request but not the pull request itself. Can you please resend the pull reques *and* include the fixup patch on that branch? Yours, Linus Walleij ^ permalink raw reply [flat|nested] 6+ messages in thread
* [linux-sunxi] Re: [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled 2014-05-08 21:56 ` Linus Walleij @ 2014-05-09 0:41 ` Maxime Ripard 0 siblings, 0 replies; 6+ messages in thread From: Maxime Ripard @ 2014-05-09 0:41 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thu, May 08, 2014 at 11:56:33PM +0200, Linus Walleij wrote: > On Thu, May 8, 2014 at 4:21 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > > I already posted a similar patch that is still pending. I was only > > waiting for Linus to merge the branch I gave him to merge it in my > > tree. > > I haven't recieved a branch :-( > > I don't know if the error is on my side ... I only have a mail stating you > will send a pull request but not the pull request itself. > > Can you please resend the pull reques *and* include the fixup patch > on that branch? I resent the pull request without the patch because it depends on something that is in my branch. I'd much prefer that you provide a stable branch I can merge into my branch, and then, apply it myself. Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140508/b46977dd/attachment.sig> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-09 0:41 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-08 13:36 [PATCH] pinctrl: sunxi Ensure the correct pinctrl drivers are enabled Hans de Goede 2014-05-08 14:21 ` Maxime Ripard 2014-05-08 14:35 ` Hans de Goede 2014-05-08 15:36 ` Maxime Ripard 2014-05-08 21:56 ` Linus Walleij 2014-05-09 0:41 ` [linux-sunxi] " Maxime Ripard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).