pinctrl: bcm63xx: Fix dependencies

Message ID 20210331124733.2059013-1-linus.walleij@linaro.org
State New
Headers show
Series
  • pinctrl: bcm63xx: Fix dependencies
Related show

Commit Message

Linus Walleij March 31, 2021, 12:47 p.m.
Add depends on OF so we don't get weird build errors on
randconfig.

Also order selects the same as the other drivers for
pure aestetic reasons.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
 drivers/pinctrl/bcm/Kconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.29.2

Comments

Randy Dunlap March 31, 2021, 6:48 p.m. | #1
On 3/31/21 5:47 AM, Linus Walleij wrote:
> Add depends on OF so we don't get weird build errors on

> randconfig.

> 

> Also order selects the same as the other drivers for

> pure aestetic reasons.

> 

> Reported-by: Randy Dunlap <rdunlap@infradead.org>

> Cc: Álvaro Fernández Rojas <noltari@gmail.com>

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> ---

>  drivers/pinctrl/bcm/Kconfig | 6 ++++--

>  1 file changed, 4 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig

> index 33660e8fec05..17615674ac1a 100644

> --- a/drivers/pinctrl/bcm/Kconfig

> +++ b/drivers/pinctrl/bcm/Kconfig

> @@ -31,10 +31,12 @@ config PINCTRL_BCM2835

>  

>  config PINCTRL_BCM63XX

>  	bool

> +	depends on OF

> +	select PINMUX

> +	select PINCONF

>  	select GENERIC_PINCONF

> +	select GPIOLIB

>  	select GPIO_REGMAP

> -	select PINCONF

> -	select PINMUX

>  

>  config PINCTRL_BCM6318

>  	bool "Broadcom BCM6318 GPIO driver"

> 


That gives me:

WARNING: unmet direct dependencies detected for PINCTRL_BCM63XX
  Depends on [n]: PINCTRL [=y] && OF [=n]
  Selected by [y]:
  - PINCTRL_BCM6328 [=y] && PINCTRL [=y] && (BMIPS_GENERIC || COMPILE_TEST [=y])
  - PINCTRL_BCM6358 [=y] && PINCTRL [=y] && (BMIPS_GENERIC || COMPILE_TEST [=y])
  - PINCTRL_BCM6362 [=y] && PINCTRL [=y] && (BMIPS_GENERIC || COMPILE_TEST [=y])
  - PINCTRL_BCM63268 [=y] && PINCTRL [=y] && (BMIPS_GENERIC || COMPILE_TEST [=y])

and

ld: drivers/pinctrl/bcm/pinctrl-bcm6328.o: in function `pinconf_generic_dt_node_to_map_pin':
pinctrl-bcm6328.c:(.text+0xe7): undefined reference to `pinconf_generic_dt_node_to_map'
ld: drivers/pinctrl/bcm/pinctrl-bcm6358.o: in function `pinconf_generic_dt_node_to_map_pin':
pinctrl-bcm6358.c:(.text+0x207): undefined reference to `pinconf_generic_dt_node_to_map'
ld: drivers/pinctrl/bcm/pinctrl-bcm6362.o: in function `pinconf_generic_dt_node_to_map_pin':
pinctrl-bcm6362.c:(.text+0xe7): undefined reference to `pinconf_generic_dt_node_to_map'
ld: drivers/pinctrl/bcm/pinctrl-bcm63268.o: in function `pinconf_generic_dt_node_to_map_pin':
pinctrl-bcm63268.c:(.text+0xe7): undefined reference to `pinconf_generic_dt_node_to_map'


-- 
~Randy

Patch

diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig
index 33660e8fec05..17615674ac1a 100644
--- a/drivers/pinctrl/bcm/Kconfig
+++ b/drivers/pinctrl/bcm/Kconfig
@@ -31,10 +31,12 @@  config PINCTRL_BCM2835
 
 config PINCTRL_BCM63XX
 	bool
+	depends on OF
+	select PINMUX
+	select PINCONF
 	select GENERIC_PINCONF
+	select GPIOLIB
 	select GPIO_REGMAP
-	select PINCONF
-	select PINMUX
 
 config PINCTRL_BCM6318
 	bool "Broadcom BCM6318 GPIO driver"