Skip to contentSkip to conversation

pinctrl: sunxi: Enable the pinctrl Kconfig options by default

PATCH New Maxime Ripard 3 participants 4 messages May 13, 2014 – May 23, 2014

Subsystems (2)
Arm/Allwinner sunXi SoC support Pin control
lore
Share & tools
lore

Maxime Ripard

author
#0 lore raw

PATCH 1/1 pinctrl: sunxi: Enable the pinctrl Kconfig options by default

Enable the freshly introduced Kconfig options whenever their matching architecture is enabled.

Since the Kconfig symbols for these machines are going through a different tree, keep PINCTRL_SUNXI around for the moment to avoid breaking the defconfig. It should be removed eventually.

Signed-off-by Maxime Ripard <[email protected]>
---
 drivers/pinctrl/sunxi/Kconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pinctrl/sunxi/Kconfig +6 -6
index 3940d098d6cb..2007327e0c48 100644
@@ -6,27 +6,27 @@ config PINCTRL_SUNXI
 	select GENERIC_PINCONF
 
 config PINCTRL_SUN4I_A10
-       bool
+       def_bool PINCTRL_SUNXI || MACH_SUN4I
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN5I_A10S
-       bool
+       def_bool PINCTRL_SUNXI || MACH_SUN5I
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN5I_A13
-       bool
+       def_bool PINCTRL_SUNXI || MACH_SUN5I
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN6I_A31
-       bool
+       def_bool PINCTRL_SUNXI || MACH_SUN6I
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN6I_A31_R
-       bool
+       def_bool PINCTRL_SUNXI || MACH_SUN6I
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN7I_A20
-       bool
+       def_bool PINCTRL_SUNXI || MACH_SUN7I
        select PINCTRL_SUNXI
 
 endif
Signature · 1 line
1.9.3
#1 lore raw

PATCH 1/1 pinctrl: sunxi: Enable the pinctrl Kconfig options by default

Quoted 8 lines · Maxime Ripard

Enable the freshly introduced Kconfig options whenever their matching architecture is enabled.

Since the Kconfig symbols for these machines are going through a different tree, keep PINCTRL_SUNXI around for the moment to avoid breaking the defconfig. It should be removed eventually.

Signed-off-by Maxime Ripard <[email protected]>

OK patch applied.

Yours,
Linus Walleij

#2 lore raw

PATCH 1/1 pinctrl: sunxi: Enable the pinctrl Kconfig options by default

Quoted 6 lines · Linus Walleij
Quoted 3 lines · Maxime Ripard

Enable the freshly introduced Kconfig options whenever their matching architecture is enabled.

Quoted 7 lines
Quoted 5 lines

Since the Kconfig symbols for these machines are going through a different tree, keep PINCTRL_SUNXI around for the moment to avoid breaking the defconfig. It should be removed eventually.

Signed-off-by Maxime Ripard <[email protected]>

OK patch applied.

I stumbled over this build error now:

/git/arm-soc/drivers/phy/phy-sun4i-usb.c: In function 'sun4i_usb_phy_probe':
/git/arm-soc/drivers/phy/phy-sun4i-usb.c:282:3: error: implicit declaration of function 'devm_reset_control_get' [-Werror=implicit-function-declaration]
phy->reset = devm_reset_control_get(dev, name);
^
/git/arm-soc/drivers/phy/phy-sun4i-usb.c:282:14: warning: assignment makes pointer from integer without a cast [enabled by default]

   phy->reset = devm_reset_control_get(dev, name);
              ^

cc1: some warnings being treated as errors
make[4]: *** [drivers/phy/phy-sun4i-usb.o] Error 1
/git/arm-soc/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c: In function 'sun6i_a31_r_pinctrl_probe':
/git/arm-soc/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c:103:2: error: implicit declaration of function 'devm_reset_control_get' [-Werror=implicit-function-declaration]
rstc = devm_reset_control_get(&pdev->dev, NULL);
^
/git/arm-soc/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c:103:7: warning: assignment makes pointer from integer without a cast [enabled by default]

  rstc = devm_reset_control_get(&pdev->dev, NULL);
       ^

cc1: some warnings being treated as errors

It seems both the phy and the pinctrl driver actually depend on the reset controller framework, but this is not reflected in Kconfig.

I guess these should either use devm_reset_control_get_optional or have 'depends on RESET_CONTROLLER' in Kconfig.

Arnd

author
#3 lore raw

PATCH 1/1 pinctrl: sunxi: Enable the pinctrl Kconfig options by default

Hi Arnd,

Quoted 16 lines · Arnd Bergmann

I stumbled over this build error now:

/git/arm-soc/drivers/phy/phy-sun4i-usb.c: In function 'sun4i_usb_phy_probe':
/git/arm-soc/drivers/phy/phy-sun4i-usb.c:282:3: error: implicit declaration of function 'devm_reset_control_get' [-Werror=implicit-function-declaration]

   phy->reset = devm_reset_control_get(dev, name);
   ^
/git/arm-soc/drivers/phy/phy-sun4i-usb.c:282:14: warning: assignment makes pointer from integer without a cast [enabled by default]
   phy->reset = devm_reset_control_get(dev, name);
              ^

cc1: some warnings being treated as errors
make[4]: *** [drivers/phy/phy-sun4i-usb.o] Error 1
/git/arm-soc/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c: In function 'sun6i_a31_r_pinctrl_probe':
/git/arm-soc/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c:103:2: error: implicit declaration of function 'devm_reset_control_get' [-Werror=implicit-function-declaration]
rstc = devm_reset_control_get(&pdev->dev, NULL);
^
/git/arm-soc/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c:103:7: warning: assignment makes pointer from integer without a cast [enabled by default]

Quoted 3 lines
  rstc = devm_reset_control_get(&pdev->dev, NULL);
       ^

cc1: some warnings being treated as errors

Grrrr :(

Quoted 5 lines

It seems both the phy and the pinctrl driver actually depend on the reset controller framework, but this is not reflected in Kconfig.

I guess these should either use devm_reset_control_get_optional or have 'depends on RESET_CONTROLLER' in Kconfig.

Yeah, we should have a depends on.

I'll send some patches.

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: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/7573f8fb/attachment.sig>