CONFIG_PINCTRL_UNIPHIER is more suitable than CONFIG_ARCH_UNIPHIER to guard the drivers/pinctrl/uniphier directory.

The current CONFIG_PINCTRL_UNIPHIER_CORE is a bit long, so rename it into CONFIG_PINCTRL_UNIPHIER.

Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---

drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/uniphier/Kconfig | 14 +++++++------- drivers/pinctrl/uniphier/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index d7b6180..37dc904 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -9,5 +9,5 @@ obj-y += nxp/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o

-obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/ +obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/ obj-$(CONFIG_PIC32_PINCTRL) += pinctrl_pic32.o diff --git a/drivers/pinctrl/uniphier/Kconfig b/drivers/pinctrl/uniphier/Kconfig index 2ff616e..33d6763 100644 --- a/drivers/pinctrl/uniphier/Kconfig +++ b/drivers/pinctrl/uniphier/Kconfig @@ -1,42 +1,42 @@ if ARCH_UNIPHIER

-config PINCTRL_UNIPHIER_CORE +config PINCTRL_UNIPHIER bool

config PINCTRL_UNIPHIER_PH1_LD4 bool "UniPhier PH1-LD4 SoC pinctrl driver" depends on ARCH_UNIPHIER_PH1_LD4 default y - select PINCTRL_UNIPHIER_CORE + select PINCTRL_UNIPHIER

config PINCTRL_UNIPHIER_PH1_PRO4 bool "UniPhier PH1-Pro4 SoC pinctrl driver" depends on ARCH_UNIPHIER_PH1_PRO4 default y - select PINCTRL_UNIPHIER_CORE + select PINCTRL_UNIPHIER

config PINCTRL_UNIPHIER_PH1_SLD8 bool "UniPhier PH1-sLD8 SoC pinctrl driver" depends on ARCH_UNIPHIER_PH1_SLD8 default y - select PINCTRL_UNIPHIER_CORE + select PINCTRL_UNIPHIER

config PINCTRL_UNIPHIER_PH1_PRO5 bool "UniPhier PH1-Pro5 SoC pinctrl driver" depends on ARCH_UNIPHIER_PH1_PRO5 default y - select PINCTRL_UNIPHIER_CORE + select PINCTRL_UNIPHIER

config PINCTRL_UNIPHIER_PROXSTREAM2 bool "UniPhier ProXstream2 SoC pinctrl driver" depends on ARCH_UNIPHIER_PROXSTREAM2 default y - select PINCTRL_UNIPHIER_CORE + select PINCTRL_UNIPHIER

config PINCTRL_UNIPHIER_PH1_LD6B bool "UniPhier PH1-LD6b SoC pinctrl driver" depends on ARCH_UNIPHIER_PH1_LD6B default y - select PINCTRL_UNIPHIER_CORE + select PINCTRL_UNIPHIER

endif diff --git a/drivers/pinctrl/uniphier/Makefile b/drivers/pinctrl/uniphier/Makefile index c5cdd84..3667bd3 100644 --- a/drivers/pinctrl/uniphier/Makefile +++ b/drivers/pinctrl/uniphier/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0+ #

-obj-$(CONFIG_PINCTRL_UNIPHIER_CORE) += pinctrl-uniphier-core.o +obj-y += pinctrl-uniphier-core.o

obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_LD4) += pinctrl-ph1-ld4.o obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO4) += pinctrl-ph1-pro4.o