Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Add LS1027A, LS1018A, LS1017A support
- Few updates related to usb, ls1012a, lx2160a
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 6b41f66..deee924 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -75,22 +75,6 @@
configuration; you can save memory footprint when this feature is
no needed.
-config PINCONF_RECURSIVE
- bool "Support recursive binding for pin configuration nodes"
- depends on PINCTRL_FULL
- default n if ARCH_STM32MP
- default y
- help
- In the Linux pinctrl binding, the pin configuration nodes need not be
- direct children of the pin controller device (may be grandchildren for
- example). It is define is each individual pin controller device.
- Say Y here if you want to keep this behavior with the pinconfig
- u-class: all sub are recursivelly bounded.
- If the option is disabled, this behavior is deactivated and only
- the direct children of pin controller will be assumed as pin
- configuration; you can save memory footprint when this feature is
- no needed.
-
config SPL_PINCTRL
bool "Support pin controllers in SPL"
depends on SPL && SPL_DM
@@ -145,15 +129,6 @@
This option is an SPL-variant of the PINCONF_RECURSIVE option.
See the help of PINCONF_RECURSIVE for details.
-config SPL_PINCONF_RECURSIVE
- bool "Support recursive binding for pin configuration nodes in SPL"
- depends on SPL_PINCTRL_FULL
- default n if ARCH_STM32MP
- default y
- help
- This option is an SPL-variant of the PINCONF_RECURSIVE option.
- See the help of PINCONF_RECURSIVE for details.
-
if PINCTRL || SPL_PINCTRL
config PINCTRL_AR933X
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 0b1eb7f..761ee29 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -157,7 +157,7 @@
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 @@
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",
};