Merge git://git.denx.de/u-boot-spi

[u-boot] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 150c68d794e8c611e6a9bf3f3687bb3fecd4db05..7e8e4b0b2762101e6730d4ae72863e73c0de26de 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -60,7 +60,7 @@ config PINCONF
          framework.
 
 config SPL_PINCTRL
-       bool "Support pin controlloers in SPL"
+       bool "Support pin controllers in SPL"
        depends on SPL && SPL_DM
        help
          This option is an SPL-variant of the PINCTRL option.
@@ -69,6 +69,7 @@ config SPL_PINCTRL
 config SPL_PINCTRL_FULL
        bool "Support full pin controllers in SPL"
        depends on SPL_PINCTRL && SPL_OF_CONTROL
+       default n if TARGET_STM32F746_DISCO
        default y
        help
          This option is an SPL-variant of the PINCTRL_FULL option.
@@ -167,6 +168,16 @@ config PINCTRL_ROCKCHIP_RK3036
          the GPIO definitions and pin control functions for each available
          multiplex function.
 
+config PINCTRL_ROCKCHIP_RK3128
+       bool "Rockchip rk3128 pin control driver"
+       depends on DM
+       help
+         Support pin multiplexing control on Rockchip rk3128 SoCs.
+
+         The driver is controlled by a device tree node which contains both
+         the GPIO definitions and pin control functions for each available
+         multiplex function.
+
 config PINCTRL_ROCKCHIP_RK3188
        bool "Rockchip rk3188 pin control driver"
        depends on DM
@@ -177,6 +188,16 @@ config PINCTRL_ROCKCHIP_RK3188
          the GPIO definitions and pin control functions for each available
          multiplex function.
 
+config PINCTRL_ROCKCHIP_RK322X
+       bool "Rockchip rk322x pin control driver"
+       depends on DM
+       help
+         Support pin multiplexing control on Rockchip rk322x SoCs.
+
+         The driver is controlled by a device tree node which contains both
+         the GPIO definitions and pin control functions for each available
+         multiplex function.
+
 config PINCTRL_ROCKCHIP_RK3288
        bool "Rockchip rk3288 pin control driver"
        depends on DM
@@ -281,6 +302,7 @@ endif
 
 source "drivers/pinctrl/meson/Kconfig"
 source "drivers/pinctrl/nxp/Kconfig"
+source "drivers/pinctrl/renesas/Kconfig"
 source "drivers/pinctrl/uniphier/Kconfig"
 source "drivers/pinctrl/exynos/Kconfig"
 source "drivers/pinctrl/mvebu/Kconfig"