aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-01-18 14:35:06 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-01-18 14:35:06 -0500
commit7452b64d0154ab8ae4933b8e97feebc1ae98d1a4 (patch)
tree18e821e56b4ec858a65bbee9b03caacca633564f
parentf868ef995b32f0f08d7b6ce700bbe25de3ad65ac (diff)
pinctrl: exynos: change PINCTRL_EXYNOS option
Since pinctrl-exynos can support exynos4 and exynos5 so changed the option name to PINCTRL_EXYNOS for more clarity. Cc: Thomas Abraham <Thomas.abraham@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-exynos/Kconfig2
-rw-r--r--drivers/pinctrl/Kconfig4
-rw-r--r--drivers/pinctrl/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e103c290bc9e..85afb031b676 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -414,7 +414,7 @@ config MACH_EXYNOS4_DT
414 select CPU_EXYNOS4210 414 select CPU_EXYNOS4210
415 select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD 415 select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
416 select PINCTRL 416 select PINCTRL
417 select PINCTRL_EXYNOS4 417 select PINCTRL_EXYNOS
418 select USE_OF 418 select USE_OF
419 help 419 help
420 Machine support for Samsung Exynos4 machine with device tree enabled. 420 Machine support for Samsung Exynos4 machine with device tree enabled.
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c9c165d08d8b..881ddcd00236 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -189,8 +189,8 @@ config PINCTRL_SAMSUNG
189 select PINMUX 189 select PINMUX
190 select PINCONF 190 select PINCONF
191 191
192config PINCTRL_EXYNOS4 192config PINCTRL_EXYNOS
193 bool "Pinctrl driver data for Exynos4 SoC" 193 bool "Pinctrl driver data for Samsung EXYNOS SoCs"
194 depends on OF && GPIOLIB 194 depends on OF && GPIOLIB
195 select PINCTRL_SAMSUNG 195 select PINCTRL_SAMSUNG
196 196
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index e5de64fd32ca..e9ad8c3851be 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_PINCTRL_TEGRA114) += pinctrl-tegra114.o
37obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o 37obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o
38obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o 38obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o
39obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o 39obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o
40obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o 40obj-$(CONFIG_PINCTRL_EXYNOS) += pinctrl-exynos.o
41obj-$(CONFIG_PINCTRL_EXYNOS5440) += pinctrl-exynos5440.o 41obj-$(CONFIG_PINCTRL_EXYNOS5440) += pinctrl-exynos5440.o
42obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o 42obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o
43obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o 43obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o