diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2019-10-21 15:02:40 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-21 09:40:54 -0400 |
| commit | 44510daea4d07fee736dd90411c4b503340b449e (patch) | |
| tree | 2a4a56b39f01f7ed8dff33678537d86c187f0fa9 | |
| parent | ae799ffcae1109eaac243afe19ddf60ba728ce7c (diff) | |
| download | u-boot-WIP/21Oct2019.tar.gz | |
dm: pinctrl: fix for introduce PINCONF_RECURSIVE optionWIP/21Oct2019
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>
| -rw-r--r-- | drivers/pinctrl/pinctrl-uclass.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 0b1eb7fab4..761ee29f41 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -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", }; |