pinctrl: sunxi Ensure the correct pinctrl drivers are enabled

PATCH New Hans de Goede 3 participants 6 messages May 8, 2014 – May 9, 2014

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Allwinner sunXi SoC support

lore

Share & tools

lore

Hans de Goede

author

2014-05-08 13:36 UTC #0 lore raw

PATCH 1/1 pinctrl: sunxi Ensure the correct pinctrl drivers are enabled

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 <[email protected]>

---
 arch/arm/mach-sunxi/Kconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

arch/arm/mach-sunxi/Kconfig +5 -1

index 3aff966..beab32e 100644
@@ -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

Signature · 1 line

1.9.0

Maxime Ripard

2014-05-08 14:21 UTC #1 lore raw

PATCH 1/1 pinctrl: sunxi Ensure the correct pinctrl drivers are enabled

Hi Hans,

Quoted 47 lines · Hans de Goede

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/mach-sunxi/Kconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

arch/arm/mach-sunxi/Kconfig +4 -1

index 3aff966..beab32e 100644
@@ -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"

arch/arm/mach-sunxi/Kconfig config MACH_SUN7I · line 41

Quoted 6 lines

arch/arm/mach-sunxi/Kconfig +1 -0

@@ -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

Signature · 10 lines

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>

Hans de Goede

author

2014-05-08 14:35 UTC #2 lore raw

PATCH 1/1 pinctrl: sunxi Ensure the correct pinctrl drivers are enabled

Hi,

Quoted 61 lines · Maxime Ripard

Hi Hans,
Quoted 47 lines · Hans de Goede
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 <[email protected]>
---
 arch/arm/mach-sunxi/Kconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/Kconfig +4 -1
index 3aff966..beab32e 100644
@@ -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"
arch/arm/mach-sunxi/Kconfig config MACH_SUN7I · line 41
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +1 -0
@@ -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.

Quoted 4 lines

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

Maxime Ripard

2014-05-08 15:36 UTC #3 lore raw

PATCH 1/1 pinctrl: sunxi Ensure the correct pinctrl drivers are enabled

Quoted 64 lines · Hans de Goede

Hi,
Quoted 61 lines · Maxime Ripard
Hi Hans,
Quoted 47 lines · Hans de Goede
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 <[email protected]>
---
 arch/arm/mach-sunxi/Kconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/Kconfig +4 -1
index 3aff966..beab32e 100644
@@ -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"
arch/arm/mach-sunxi/Kconfig config MACH_SUN7I · line 41
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +1 -0
@@ -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.

Quoted 7 lines

Quoted 4 lines
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 :)

Signature · 10 lines

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>

Linus Walleij

2014-05-08 21:56 UTC #4 lore raw

PATCH 1/1 pinctrl: sunxi Ensure the correct pinctrl drivers are enabled

In reply to Maxime Ripard

Quoted 3 lines · Maxime Ripard

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

Maxime Ripard

2014-05-09 00:41 UTC #5 lore raw

Hi,

Quoted 7 lines · Linus Walleij

Quoted 3 lines · Maxime Ripard
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.

Quoted 7 lines

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

Signature · 10 lines

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>