diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-10-30 06:28:15 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-10-31 17:13:07 -0400 |
| commit | 241297c2af8bf0459a590c143a1d15b93779fab1 (patch) | |
| tree | 0bfd9bd7f4264e82c2a72f6e0249536474dadbf6 /drivers/pinctrl/uniphier | |
| parent | a7c6f30c02326a5acccc602b0d0f08a9853eec3f (diff) | |
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/uniphier')
| -rw-r--r-- | drivers/pinctrl/uniphier/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/pinctrl/uniphier/Makefile | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pinctrl/uniphier/Kconfig b/drivers/pinctrl/uniphier/Kconfig index eab23ef9ddbf..ad907072e09f 100644 --- a/drivers/pinctrl/uniphier/Kconfig +++ b/drivers/pinctrl/uniphier/Kconfig | |||
| @@ -1,32 +1,32 @@ | |||
| 1 | if ARCH_UNIPHIER | 1 | if ARCH_UNIPHIER |
| 2 | 2 | ||
| 3 | config PINCTRL_UNIPHIER_CORE | 3 | config PINCTRL_UNIPHIER |
| 4 | bool | 4 | bool |
| 5 | select PINMUX | 5 | select PINMUX |
| 6 | select GENERIC_PINCONF | 6 | select GENERIC_PINCONF |
| 7 | 7 | ||
| 8 | config PINCTRL_UNIPHIER_PH1_LD4 | 8 | config PINCTRL_UNIPHIER_PH1_LD4 |
| 9 | tristate "UniPhier PH1-LD4 SoC pinctrl driver" | 9 | tristate "UniPhier PH1-LD4 SoC pinctrl driver" |
| 10 | select PINCTRL_UNIPHIER_CORE | 10 | select PINCTRL_UNIPHIER |
| 11 | 11 | ||
| 12 | config PINCTRL_UNIPHIER_PH1_PRO4 | 12 | config PINCTRL_UNIPHIER_PH1_PRO4 |
| 13 | tristate "UniPhier PH1-Pro4 SoC pinctrl driver" | 13 | tristate "UniPhier PH1-Pro4 SoC pinctrl driver" |
| 14 | select PINCTRL_UNIPHIER_CORE | 14 | select PINCTRL_UNIPHIER |
| 15 | 15 | ||
| 16 | config PINCTRL_UNIPHIER_PH1_SLD8 | 16 | config PINCTRL_UNIPHIER_PH1_SLD8 |
| 17 | tristate "UniPhier PH1-sLD8 SoC pinctrl driver" | 17 | tristate "UniPhier PH1-sLD8 SoC pinctrl driver" |
| 18 | select PINCTRL_UNIPHIER_CORE | 18 | select PINCTRL_UNIPHIER |
| 19 | 19 | ||
| 20 | config PINCTRL_UNIPHIER_PH1_PRO5 | 20 | config PINCTRL_UNIPHIER_PH1_PRO5 |
| 21 | tristate "UniPhier PH1-Pro5 SoC pinctrl driver" | 21 | tristate "UniPhier PH1-Pro5 SoC pinctrl driver" |
| 22 | select PINCTRL_UNIPHIER_CORE | 22 | select PINCTRL_UNIPHIER |
| 23 | 23 | ||
| 24 | config PINCTRL_UNIPHIER_PROXSTREAM2 | 24 | config PINCTRL_UNIPHIER_PROXSTREAM2 |
| 25 | tristate "UniPhier ProXstream2 SoC pinctrl driver" | 25 | tristate "UniPhier ProXstream2 SoC pinctrl driver" |
| 26 | select PINCTRL_UNIPHIER_CORE | 26 | select PINCTRL_UNIPHIER |
| 27 | 27 | ||
| 28 | config PINCTRL_UNIPHIER_PH1_LD6B | 28 | config PINCTRL_UNIPHIER_PH1_LD6B |
| 29 | tristate "UniPhier PH1-LD6b SoC pinctrl driver" | 29 | tristate "UniPhier PH1-LD6b SoC pinctrl driver" |
| 30 | select PINCTRL_UNIPHIER_CORE | 30 | select PINCTRL_UNIPHIER |
| 31 | 31 | ||
| 32 | endif | 32 | endif |
diff --git a/drivers/pinctrl/uniphier/Makefile b/drivers/pinctrl/uniphier/Makefile index e215b1097297..e7ce9670306c 100644 --- a/drivers/pinctrl/uniphier/Makefile +++ b/drivers/pinctrl/uniphier/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | obj-$(CONFIG_PINCTRL_UNIPHIER_CORE) += pinctrl-uniphier-core.o | 1 | obj-y += pinctrl-uniphier-core.o |
| 2 | 2 | ||
| 3 | obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_LD4) += pinctrl-ph1-ld4.o | 3 | obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_LD4) += pinctrl-ph1-ld4.o |
| 4 | obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO4) += pinctrl-ph1-pro4.o | 4 | obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO4) += pinctrl-ph1-pro4.o |