pinctrl: Kconfig: sort pinctrl config options to prevent future clutter

This originally started out as
     "pinctrl: Kconfig: reorder to keep Rockchip options together"
and tried to keep the Rockchip-related config options together.

However, we now rewrite all chip-specific driver selections to start
with CONFIG_PINCTRL_ (with the inadvertent changes to related
Makefiles) and sort those alphabetically. And as this already means
touching most of the file, we also reformat the help text to not exceed
80 characters (but make full use of those 80 characters).

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig
index f3472ae16f5d6ed7a44dfcbd230ad3c2404fa5ab..2550aeecb7315db2abdfdf224e1bc87a17fd7e30 100644 (file)
--- a/configs/ap121_defconfig
+++ b/configs/ap121_defconfig
@@ -40,7 +40,7 @@ CONFIG_DM_ETH=y
 CONFIG_AG7XXX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
-CONFIG_AR933X_PINCTRL=y
+CONFIG_PINCTRL_AR933X=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_AR933X=y

diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index a29e4e5cf173fe9e2886c09675544cb664abfced..e1f96dce12d10ea88e4a62621cc74e09ed81a85a 100644 (file)
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -51,7 +51,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_RK808=y

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index e642b8dba16698b8337925e9895ecd21826d057f..baebca970bb26e93d3955f39940fc0b87e645267 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -52,7 +52,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_RK808=y

diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 1812362679822dc68b3266ed65af067d49e318a2..ea57810e9568f5edd393b5d4f0abd275bb85bf86 100644 (file)
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -52,7 +52,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_RK808=y

diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 19ecae5e53d0cb6f6c27b2224bdad6ee51a761a4..4a5664dfa48f7418c246b283e24b5ad9aee19fed 100644 (file)
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -28,7 +28,7 @@ CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
-CONFIG_ROCKCHIP_RK3036_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3036=y
 CONFIG_RAM=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DEBUG_UART=y

diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index aad25339987c0ac55fcb93fb1f74efb953394024..6507011cabd242f332cd88ee8d15119216a48db8 100644 (file)
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -48,7 +48,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_ACT8846=y
 CONFIG_REGULATOR_ACT8846=y

diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
index a9304fe039ee6bd0d63df0656fb4d6ec7a0a8888..c834a4af286f63146ae44e31f32509308afb3813 100644 (file)
--- a/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@ -22,7 +22,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
-CONFIG_ROCKCHIP_RK3328_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3328=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y

diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index cef8506d997292a0ebb137f0494bebd408b22a30..b115f0450736c6aa4848d5399db644026972caeb 100644 (file)
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -39,7 +39,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
-CONFIG_ROCKCHIP_RK3399_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3399=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_PWM_ROCKCHIP=y

diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index d1b0ffc467a688754d16ef74a7ca6e608901d396..a2d273c804ada2f3c875c6e658928fa93fe34ea8 100644 (file)
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -48,7 +48,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_RK808=y
 CONFIG_DM_REGULATOR_FIXED=y

diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index b0741d7bd91677d10ff3399e64879f4576e48e4b..69a54921777a78c66090f3db7716e77c6aee0728 100644 (file)
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -49,7 +49,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_ACT8846=y

diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index 2b127307c830fe06f1af915840a0e0bf8d46670b..ba65bc94986c39e28655b2bd856132ffcdba4564 100644 (file)
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -29,7 +29,7 @@ CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
-CONFIG_ROCKCHIP_RK3036_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3036=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y
 CONFIG_SYSRESET=y

diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
index 203824b893853a1954c7f09d4132263fad538a8d..2b9da554a955f8a585a11d9f6ed758aff50ad8c3 100644 (file)
--- a/configs/miqi-rk3288_defconfig
+++ b/configs/miqi-rk3288_defconfig
@@ -47,7 +47,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_ACT8846=y
 CONFIG_REGULATOR_ACT8846=y

diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index dfc84b9a83de81562125ca33976dcdb2e418f80d..80bc83b2c2ddce818dbc65dc76c9d415bf11d8be 100644 (file)
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -48,7 +48,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_RK808=y
 CONFIG_DM_REGULATOR_FIXED=y

diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
index 500f22093e1cf527fddba18337e9d4bbb564d5ba..137f7fb1ed4abc1f453a68770e15212f74e7b1eb 100644 (file)
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -50,7 +50,7 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
-CONFIG_ROCKCHIP_RK3399_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3399=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_PWM_ROCKCHIP=y

diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index e9a32a93c2f07b6ce8921c8d9eff76d7bc295441..ae432ad14db018e577810f400b6f85796473b075 100644 (file)
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -46,7 +46,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_ACT8846=y

diff --git a/configs/rock_defconfig b/configs/rock_defconfig
index b61286e84b6bc0bc297615155c7788abdc21f6fc..8e81794883595a28883870b3518955ddf5053152 100644 (file)
--- a/configs/rock_defconfig
+++ b/configs/rock_defconfig
@@ -33,7 +33,7 @@ CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PINCTRL=y
-CONFIG_ROCKCHIP_RK3188_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3188=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_ACT8846=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index cdaf3bb74333bbc2d94d6edcc3f11a5f1cf98f75..77a07ac3e14e125253aa1f14fb2dc8d0907cb69f 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -114,8 +114,8 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_SANDBOX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
-CONFIG_ROCKCHIP_RK3036_PINCTRL=y
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3036=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_PINCTRL_SANDBOX=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_SANDBOX_POWER_DOMAIN=y

diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 087c7a84fc4ca118623c67d92ff21430362fb323..c4610e8efb1abe894bba0ee4564e06c394f8bee5 100644 (file)
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -120,8 +120,8 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_SANDBOX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
-CONFIG_ROCKCHIP_RK3036_PINCTRL=y
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3036=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_PINCTRL_SANDBOX=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_ACT8846=y

diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index cec39384b3c614de69173cc1f470b23d612785ea..cd9189f0affdffab7542142cfe0fea91a8f7d3cd 100644 (file)
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -48,7 +48,7 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
-CONFIG_ROCKCHIP_RK3288_PINCTRL=y
+CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_RK808=y
 CONFIG_DM_REGULATOR_FIXED=y

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 355aeae854d8dd554997b59ad66b1f8d380ff19f..9cea6f202cf9a003de03fb4d3de3889cbaff6c86 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -105,7 +105,7 @@ config SPL_PINCONF
 
 if PINCTRL || SPL_PINCTRL
 
-config AR933X_PINCTRL
+config PINCTRL_AR933X
        bool "QCA/Athores ar933x pin control driver"
        depends on DM && SOC_AR933X
        help
@@ -114,98 +114,118 @@ config AR933X_PINCTRL
          both the GPIO definitions and pin control functions for each
          available multiplex function.
 
-config QCA953X_PINCTRL
+config PINCTRL_AT91
+       bool "AT91 pinctrl driver"
+       depends on DM
+       help
+         This option is to enable the AT91 pinctrl driver for AT91 PIO
+         controller.
+
+         AT91 PIO controller is a combined gpio-controller, pin-mux and
+         pin-config module. Each I/O pin may be dedicated as a general-purpose
+         I/O or be assigned to a function of an embedded peripheral. Each I/O
+         pin has a glitch filter providing rejection of glitches lower than
+         one-half of peripheral clock cycle and a debouncing filter providing
+         rejection of unwanted pulses from key or push button operations. You
+         can also control the multi-driver capability, pull-up and pull-down
+         feature on each I/O pin.
+
+config PINCTRL_AT91PIO4
+       bool "AT91 PIO4 pinctrl driver"
+       depends on DM
+       help
+         This option is to enable the AT91 pinctrl driver for AT91 PIO4
+         controller which is available on SAMA5D2 SoC.
+
+config PINCTRL_PIC32
+       bool "Microchip PIC32 pin-control and pin-mux driver"
+       depends on DM && MACH_PIC32
+       default y
+       help
+         Supports individual pin selection and configuration for each
+         remappable peripheral available on Microchip PIC32
+         SoCs. This driver is controlled by a device tree node which
+         contains both GPIO defintion and pin control functions.
+
+config PINCTRL_QCA953X
        bool "QCA/Athores qca953x pin control driver"
        depends on DM && SOC_QCA953X
        help
          Support pin multiplexing control on QCA/Athores qca953x 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 ROCKCHIP_RK3036_PINCTRL
+         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_RK3036
        bool "Rockchip rk3036 pin control driver"
        depends on DM
        help
-         Support pin multiplexing control on Rockchip rk3036 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.
+         Support pin multiplexing control on Rockchip rk3036 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 ROCKCHIP_RK3188_PINCTRL
+config PINCTRL_ROCKCHIP_RK3188
        bool "Rockchip rk3188 pin control driver"
        depends on DM
        help
-         Support pin multiplexing control on Rockchip rk3188 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.
+         Support pin multiplexing control on Rockchip rk3188 SoCs.
 
-config ROCKCHIP_RK3288_PINCTRL
-       bool "Rockchip rk3288 pin control driver"
-       depends on DM
-       help
-         Support pin multiplexing control on Rockchip rk3288 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.
+         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_AT91
-       bool "AT91 pinctrl driver"
+config PINCTRL_ROCKCHIP_RK3288
+       bool "Rockchip rk3288 pin control driver"
        depends on DM
        help
-         This option is to enable the AT91 pinctrl driver for AT91 PIO
-         controller. AT91 PIO controller is a combined gpio-controller,
-         pin-mux and pin-config module. Each I/O pin may be dedicated as
-         a general-purpose I/O or be assigned to a function of an embedded
-         peripheral. Each I/O pin has a glitch filter providing rejection of
-         glitches lower than one-half of peripheral clock cycle and
-         a debouncing filter providing rejection of unwanted pulses from key
-         or push button operations. You can also control the multi-driver
-         capability, pull-up and pull-down feature on each I/O pin.
+         Support pin multiplexing control on Rockchip rk3288 SoCs.
 
-config PINCTRL_AT91PIO4
-       bool "AT91 PIO4 pinctrl driver"
-       depends on DM
-       help
-         This option is to enable the AT91 pinctrl driver for AT91 PIO4
-         controller which is available on SAMA5D2 SoC.
+         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 ROCKCHIP_RK3328_PINCTRL
+config PINCTRL_ROCKCHIP_RK3328
        bool "Rockchip rk3328 pin control driver"
        depends on DM
        help
-         Support pin multiplexing control on Rockchip rk3328 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.
+         Support pin multiplexing control on Rockchip rk3328 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 ROCKCHIP_RK3399_PINCTRL
+config PINCTRL_ROCKCHIP_RK3399
        bool "Rockchip rk3399 pin control driver"
        depends on DM
        help
-         Support pin multiplexing control on Rockchip rk3399 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.
+         Support pin multiplexing control on Rockchip rk3399 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_SANDBOX
        bool "Sandbox pinctrl driver"
        depends on SANDBOX
        help
-         This enables pinctrl driver for sandbox.  Currently, this driver
-         actually does nothing but print debug messages when pinctrl
-         operations are invoked.
+         This enables pinctrl driver for sandbox.
 
-config PIC32_PINCTRL
-       bool "Microchip PIC32 pin-control and pin-mux driver"
-       depends on DM && MACH_PIC32
-       default y
+         Currently, this driver actually does nothing but print debug
+         messages when pinctrl operations are invoked.
+
+config PINCTRL_SINGLE
+       bool "Single register pin-control and pin-multiplex driver"
+       depends on DM
        help
-         Supports individual pin selection and configuration for each remappable
-         peripheral available on Microchip PIC32 SoCs. This driver is controlled
-         by a device tree node which contains both GPIO defintion and pin control
-         functions.
+         This enables pinctrl driver for systems using a single register for
+         pin configuration and multiplexing. TI's AM335X SoCs are examples of
+         such systems.
+
+         Depending on the platform make sure to also enable OF_TRANSLATE and
+         eventually SPL_OF_TRANSLATE to get correct address translations.
 
 config PINCTRL_STI
        bool "STMicroelectronics STi pin-control and pin-mux driver"
@@ -213,28 +233,20 @@ config PINCTRL_STI
        default y
        help
          Support pin multiplexing control on STMicrolectronics STi 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.
+         the GPIO definitions and pin control functions for each available
+         multiplex function.
 
 config PINCTRL_STM32
        bool "ST STM32 pin control driver"
        depends on DM
        help
-         Supports pin multiplexing control on stm32 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.
+         Supports pin multiplexing control on stm32 SoCs.
 
-config PINCTRL_SINGLE
-       bool "Single register pin-control and pin-multiplex driver"
-       depends on DM
-       help
-         This enables pinctrl driver for systems using a single register for
-         pin configuration and multiplexing. TI's AM335X SoCs are examples of
-         such systems.
-         Depending on the platform make sure to also enable OF_TRANSLATE and
-         eventually SPL_OF_TRANSLATE to get correct address translations.
+         The driver is controlled by a device tree node which contains both
+         the GPIO definitions and pin control functions for each available
+         multiplex function.
 
 endif
 

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index bbb2480e865173405768ee30e9527677f16f3bd8..17a7173d3550e678542639497bd15dd78d625d76 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
 obj-$(CONFIG_PINCTRL_SANDBOX)  += pinctrl-sandbox.o
 
 obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/
-obj-$(CONFIG_PIC32_PINCTRL)    += pinctrl_pic32.o
+obj-$(CONFIG_PINCTRL_PIC32)    += pinctrl_pic32.o
 obj-$(CONFIG_PINCTRL_EXYNOS)   += exynos/
 obj-$(CONFIG_PINCTRL_MESON)    += meson/
 obj-$(CONFIG_PINCTRL_MVEBU)    += mvebu/

diff --git a/drivers/pinctrl/ath79/Makefile b/drivers/pinctrl/ath79/Makefile
index dcea10ace6a724a0a04c676a4c4d3f0c63c3eca6..c87a9aa3e70c2d1608b790b97cdd56fcefd13948 100644 (file)
--- a/drivers/pinctrl/ath79/Makefile
+++ b/drivers/pinctrl/ath79/Makefile
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-$(CONFIG_AR933X_PINCTRL) += pinctrl_ar933x.o
-obj-$(CONFIG_QCA953x_PINCTRL) += pinctrl_qca953x.o
+obj-$(CONFIG_PINCTRL_AR933X) += pinctrl_ar933x.o
+obj-$(CONFIG_PINCTRL_QCA953x) += pinctrl_qca953x.o

diff --git a/drivers/pinctrl/rockchip/Makefile b/drivers/pinctrl/rockchip/Makefile
index b0b698ac04a4a3c1fca44e7e99659ef1f1e63436..69eef4c0240f4567c71590c92c36e4ddbf3054ba 100644 (file)
--- a/drivers/pinctrl/rockchip/Makefile
+++ b/drivers/pinctrl/rockchip/Makefile
@@ -5,8 +5,8 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-$(CONFIG_ROCKCHIP_RK3036_PINCTRL) += pinctrl_rk3036.o
-obj-$(CONFIG_ROCKCHIP_RK3188_PINCTRL) += pinctrl_rk3188.o
-obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o
-obj-$(CONFIG_ROCKCHIP_RK3328_PINCTRL) += pinctrl_rk3328.o
-obj-$(CONFIG_ROCKCHIP_RK3399_PINCTRL) += pinctrl_rk3399.o
+obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3036) += pinctrl_rk3036.o
+obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3188) += pinctrl_rk3188.o
+obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3288) += pinctrl_rk3288.o
+obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3328) += pinctrl_rk3328.o
+obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3399) += pinctrl_rk3399.o