[U-Boot] pinctrl: Kconfig: remove duplicated nodes
diff mbox series

Message ID 20191021130754.32466-1-patrick.delaunay@st.com
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] pinctrl: Kconfig: remove duplicated nodes
Related show

Commit Message

Patrick DELAUNAY Oct. 21, 2019, 1:07 p.m. UTC
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 <patrick.delaunay@st.com>
---

 drivers/pinctrl/Kconfig | 25 -------------------------
 1 file changed, 25 deletions(-)

Comments

Anatolij Gustschin Oct. 21, 2019, 3:44 p.m. UTC | #1
Hi Patrick,

On Mon, 21 Oct 2019 15:07:54 +0200
Patrick Delaunay patrick.delaunay@st.com wrote:

> Remove the duplicated configs introduced when the same patch is
> applied twice times:

There is already a patch pending http://patchwork.ozlabs.org/patch/1179889

--
Anatolij
Tom Rini Oct. 21, 2019, 5:26 p.m. UTC | #2
On Mon, Oct 21, 2019 at 03:07:54PM +0200, Patrick Delaunay wrote:

> 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 <patrick.delaunay@st.com>

Applied to u-boot/master, thanks!

Patch
diff mbox series

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