From: Patrick Delaunay Date: Mon, 21 Oct 2019 13:07:54 +0000 (+0200) Subject: pinctrl: Kconfig: remove duplicated nodes X-Git-Tag: v2020.01-rc1~14 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae799ffcae1109eaac243afe19ddf60ba728ce7c;p=oweals%2Fu-boot.git pinctrl: Kconfig: remove duplicated nodes Remove the duplicated configs introduced when the same patch is applied twice times: - commit e878b53a79d1 ("dm: pinctrl: introduce PINCONF_RECURSIVE option") - commit c20851b3d850 ("dm: pinctrl: introduce PINCONF_RECURSIVE option") Signed-off-by: Patrick Delaunay --- diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 6b41f66a86..deee92411c 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -75,22 +75,6 @@ config PINCONF_RECURSIVE 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 @@ config SPL_PINCONF_RECURSIVE 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