]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: pinctrl: fix for introduce PINCONF_RECURSIVE option
authorPatrick Delaunay <patrick.delaunay@st.com>
Mon, 21 Oct 2019 13:02:40 +0000 (15:02 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 21 Oct 2019 13:40:54 +0000 (09:40 -0400)
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")

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
drivers/pinctrl/pinctrl-uclass.c

index 0b1eb7fab4a454d6227364455c2c9c8e3637b7ae..761ee29f4174470a6bf3fd0747741cd52af2de8c 100644 (file)
@@ -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",
 };