diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2011-05-23 04:27:45 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-05-26 19:32:50 -0400 |
commit | ab48f16137eb5a6fabcff4cc817319394fc0de7e (patch) | |
tree | 47e63dd380ddaec18872a7e50b8563309a068717 | |
parent | fed6a0224714bd414bff91833e0bd5775a3e9c66 (diff) |
gpio: Move the exynos4 GPIO to drivers/gpio
Move the Samsung Exynos4 series SoCs GPIO driver to drivers/gpio
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r-- | arch/arm/mach-exynos4/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpio/Kconfig | 6 | ||||
-rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpio/gpio-exynos4.c (renamed from arch/arm/mach-exynos4/gpiolib.c) | 0 |
4 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index 777897551e42..97837e75afa3 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile | |||
@@ -13,7 +13,7 @@ obj- := | |||
13 | # Core support for EXYNOS4 system | 13 | # Core support for EXYNOS4 system |
14 | 14 | ||
15 | obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o | 15 | obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o |
16 | obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o gpiolib.o irq-eint.o dma.o | 16 | obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o |
17 | obj-$(CONFIG_PM) += pm.o sleep.o | 17 | obj-$(CONFIG_PM) += pm.o sleep.o |
18 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o | 18 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o |
19 | 19 | ||
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 3735c051074f..dbe43b4e02ba 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
@@ -86,6 +86,12 @@ config GPIO_IT8761E | |||
86 | help | 86 | help |
87 | Say yes here to support GPIO functionality of IT8761E super I/O chip. | 87 | Say yes here to support GPIO functionality of IT8761E super I/O chip. |
88 | 88 | ||
89 | config GPIO_EXYNOS4 | ||
90 | bool "Samsung Exynos4 GPIO library support" | ||
91 | default y if CPU_EXYNOS4210 | ||
92 | help | ||
93 | Say yes here to support Samsung Exynos4 series SoCs GPIO library | ||
94 | |||
89 | config GPIO_PLAT_SAMSUNG | 95 | config GPIO_PLAT_SAMSUNG |
90 | bool "Samsung SoCs GPIO library support" | 96 | bool "Samsung SoCs GPIO library support" |
91 | default y if SAMSUNG_GPIOLIB_4BIT | 97 | default y if SAMSUNG_GPIOLIB_4BIT |
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 426483f60d63..d7f960140bfb 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
@@ -8,6 +8,7 @@ obj-$(CONFIG_GPIO_ADP5520) += adp5520-gpio.o | |||
8 | obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o | 8 | obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o |
9 | obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o | 9 | obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o |
10 | obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o | 10 | obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o |
11 | obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o | ||
11 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o | 12 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o |
12 | obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o | 13 | obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o |
13 | obj-$(CONFIG_GPIO_MAX730X) += max730x.o | 14 | obj-$(CONFIG_GPIO_MAX730X) += max730x.o |
diff --git a/arch/arm/mach-exynos4/gpiolib.c b/drivers/gpio/gpio-exynos4.c index d54ca6adb660..d54ca6adb660 100644 --- a/arch/arm/mach-exynos4/gpiolib.c +++ b/drivers/gpio/gpio-exynos4.c | |||