LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: uniphier: guard uniphier directory with CONFIG_PINCTRL_UNIPHIER 

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>
This commit is contained in:
Masahiro Yamada 2016-03-04 15:56:31 +09:00
parent fdd15b6a86
commit 1d22c4b1bd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/Makefile
View File

@ -9,5 +9,5 @@ obj-y += nxp/
obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o
obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/ obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/
obj-$(CONFIG_PIC32_PINCTRL) += pinctrl_pic32.o obj-$(CONFIG_PIC32_PINCTRL) += pinctrl_pic32.o

14
drivers/pinctrl/uniphier/Kconfig
View File

@ -1,42 +1,42 @@
if ARCH_UNIPHIER if ARCH_UNIPHIER
config PINCTRL_UNIPHIER_CORE config PINCTRL_UNIPHIER
bool bool
config PINCTRL_UNIPHIER_PH1_LD4 config PINCTRL_UNIPHIER_PH1_LD4
bool "UniPhier PH1-LD4 SoC pinctrl driver" bool "UniPhier PH1-LD4 SoC pinctrl driver"
depends on ARCH_UNIPHIER_PH1_LD4 depends on ARCH_UNIPHIER_PH1_LD4
default y default y
select PINCTRL_UNIPHIER_CORE select PINCTRL_UNIPHIER
config PINCTRL_UNIPHIER_PH1_PRO4 config PINCTRL_UNIPHIER_PH1_PRO4
bool "UniPhier PH1-Pro4 SoC pinctrl driver" bool "UniPhier PH1-Pro4 SoC pinctrl driver"
depends on ARCH_UNIPHIER_PH1_PRO4 depends on ARCH_UNIPHIER_PH1_PRO4
default y default y
select PINCTRL_UNIPHIER_CORE select PINCTRL_UNIPHIER
config PINCTRL_UNIPHIER_PH1_SLD8 config PINCTRL_UNIPHIER_PH1_SLD8
bool "UniPhier PH1-sLD8 SoC pinctrl driver" bool "UniPhier PH1-sLD8 SoC pinctrl driver"
depends on ARCH_UNIPHIER_PH1_SLD8 depends on ARCH_UNIPHIER_PH1_SLD8
default y default y
select PINCTRL_UNIPHIER_CORE select PINCTRL_UNIPHIER
config PINCTRL_UNIPHIER_PH1_PRO5 config PINCTRL_UNIPHIER_PH1_PRO5
bool "UniPhier PH1-Pro5 SoC pinctrl driver" bool "UniPhier PH1-Pro5 SoC pinctrl driver"
depends on ARCH_UNIPHIER_PH1_PRO5 depends on ARCH_UNIPHIER_PH1_PRO5
default y default y
select PINCTRL_UNIPHIER_CORE select PINCTRL_UNIPHIER
config PINCTRL_UNIPHIER_PROXSTREAM2 config PINCTRL_UNIPHIER_PROXSTREAM2
bool "UniPhier ProXstream2 SoC pinctrl driver" bool "UniPhier ProXstream2 SoC pinctrl driver"
depends on ARCH_UNIPHIER_PROXSTREAM2 depends on ARCH_UNIPHIER_PROXSTREAM2
default y default y
select PINCTRL_UNIPHIER_CORE select PINCTRL_UNIPHIER
config PINCTRL_UNIPHIER_PH1_LD6B config PINCTRL_UNIPHIER_PH1_LD6B
bool "UniPhier PH1-LD6b SoC pinctrl driver" bool "UniPhier PH1-LD6b SoC pinctrl driver"
depends on ARCH_UNIPHIER_PH1_LD6B depends on ARCH_UNIPHIER_PH1_LD6B
default y default y
select PINCTRL_UNIPHIER_CORE select PINCTRL_UNIPHIER
endif endif

2
drivers/pinctrl/uniphier/Makefile
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0+ # 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_LD4) += pinctrl-ph1-ld4.o
obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO4) += pinctrl-ph1-pro4.o obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO4) += pinctrl-ph1-pro4.o