Skip to contentSkip to conversation

dm: pinctrl: fix for introduce PINCONF_RECURSIVE option

PATCH New Patrick Delaunay 2 participants 2 messages Oct 21, 2019 Pin control

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dm: pinctrl: fix for introduce PINCONF_RECURSIVE option

Correct the name of the define used CONFIG_IS_ENABLED which is not aligned with Kconfig name: CONFIG_$(SPL_)PINCONF_RECURSIVE.

The recursive calls is conditional only for UCLASS_PINCONFIG "pinconfig" driver.
It is always needed to call pinctrl_post_bind for UCLASS_PINCTRL "pinctrl", the test CONFIG_IS_ENABLED(PINCONF_RECURSIVE) need to be removed for this driver.

This correct a regression introduced because the same patch is applied twice times in u-boot-dm branch:
- commit e878b53a79d1 ("dm: pinctrl: introduce PINCONF_RECURSIVE option")
- commit c20851b3d850 ("dm: pinctrl: introduce PINCONF_RECURSIVE option")

---
Hi,

This patch solve regression on stm32mp157c-ev1 board (boot failed) on master branch since Merge tag 'dm-pull-15oct19' of
https://gitlab.denx.de/u-boot/custodians/u-boot-dm

The V1 patch was a partial solution, it solve the first issue detected on sandbox.

Regards

Patrick

Changes in v2:
- update a second error after tests: don't remove post bind ops for pinctrl driver.

 drivers/pinctrl/pinctrl-uclass.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pinctrl/pinctrl-uclass.c +1 -3
index 0b1eb7fab4..761ee29f41 100644
@@ -157,7 +157,7 @@ static int pinconfig_post_bind(struct udevice *dev)
 
 UCLASS_DRIVER(pinconfig) = {
 	.id = UCLASS_PINCONFIG,
-#if CONFIG_IS_ENABLED(PINCONFIG_RECURSIVE)
+#if CONFIG_IS_ENABLED(PINCONF_RECURSIVE)
 	.post_bind = pinconfig_post_bind,
 #endif
 	.name = "pinconfig",
@@ -426,9 +426,7 @@ static int __maybe_unused pinctrl_post_bind(struct udevice *dev)
 
 UCLASS_DRIVER(pinctrl) = {
 	.id = UCLASS_PINCTRL,
-#if CONFIG_IS_ENABLED(PINCONF_RECURSIVE)
 	.post_bind = pinctrl_post_bind,
-#endif
 	.flags = DM_UC_FLAG_SEQ_ALIAS,
 	.name = "pinctrl",
 };
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 dm: pinctrl: fix for introduce PINCONF_RECURSIVE option

Quoted 9 lines · Patrick Delaunay

Correct the name of the define used CONFIG_IS_ENABLED which is not aligned with Kconfig name: CONFIG_$(SPL_)PINCONF_RECURSIVE.

The recursive calls is conditional only for UCLASS_PINCONFIG "pinconfig" driver.
It is always needed to call pinctrl_post_bind for UCLASS_PINCTRL "pinctrl", the test CONFIG_IS_ENABLED(PINCONF_RECURSIVE) need to be removed for this driver.

Quoted 8 lines

This correct a regression introduced because the same patch is applied twice times in u-boot-dm branch:
- commit e878b53a79d1 ("dm: pinctrl: introduce PINCONF_RECURSIVE option")
- commit c20851b3d850 ("dm: pinctrl: introduce PINCONF_RECURSIVE option")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191021/b11b7105/attachment.sig>