Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 241297c2 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

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
(it would break the indentation in drivers/pinctrl/Makefile),
so rename it into CONFIG_PINCTRL_UNIPHIER.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a7c6f30c

drivers/pinctrl/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,6 @@ obj-$(CONFIG_PINCTRL_SAMSUNG) += samsung/ 
obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc/

obj-$(CONFIG_PLAT_SPEAR)	+= spear/

obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/

obj-$(CONFIG_ARCH_UNIPHIER)	+= uniphier/

obj-$(CONFIG_PINCTRL_UNIPHIER)	+= uniphier/

obj-$(CONFIG_ARCH_VT8500)	+= vt8500/

obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

drivers/pinctrl/uniphier/Kconfig

+7 −7
Original line number Diff line number Diff line 
if ARCH_UNIPHIER



config PINCTRL_UNIPHIER_CORE

config PINCTRL_UNIPHIER

	bool

	select PINMUX

	select GENERIC_PINCONF



config PINCTRL_UNIPHIER_PH1_LD4

	tristate "UniPhier PH1-LD4 SoC pinctrl driver"

	select PINCTRL_UNIPHIER_CORE

	select PINCTRL_UNIPHIER



config PINCTRL_UNIPHIER_PH1_PRO4

	tristate "UniPhier PH1-Pro4 SoC pinctrl driver"

	select PINCTRL_UNIPHIER_CORE

	select PINCTRL_UNIPHIER



config PINCTRL_UNIPHIER_PH1_SLD8

	tristate "UniPhier PH1-sLD8 SoC pinctrl driver"

	select PINCTRL_UNIPHIER_CORE

	select PINCTRL_UNIPHIER



config PINCTRL_UNIPHIER_PH1_PRO5

	tristate "UniPhier PH1-Pro5 SoC pinctrl driver"

	select PINCTRL_UNIPHIER_CORE

	select PINCTRL_UNIPHIER



config PINCTRL_UNIPHIER_PROXSTREAM2

	tristate "UniPhier ProXstream2 SoC pinctrl driver"

	select PINCTRL_UNIPHIER_CORE

	select PINCTRL_UNIPHIER



config PINCTRL_UNIPHIER_PH1_LD6B

	tristate "UniPhier PH1-LD6b SoC pinctrl driver"

	select PINCTRL_UNIPHIER_CORE

	select PINCTRL_UNIPHIER



endif

drivers/pinctrl/uniphier/Makefile

+1 −1
Original line number Diff line number Diff line 
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