2011-05-18 11:55:49

by Kyungmin Park

Subject: [PATCH] Exynos4: Move GPIO drivers to drivers/gpio

From: Kyungmin Park <[email protected]>

Samsung Exynos4 gpio driver moved to drivers/gpio.

Cc: Arnd Bergmann <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
---
diff --git a/arch/arm/mach-exynos4/gpiolib.c b/drivers/gpio/exynos4-gpio.c
similarity index 100%
rename from arch/arm/mach-exynos4/gpiolib.c
rename to drivers/gpio/exynos4-gpio.c
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 9be104f..3bb3f57 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -13,7 +13,7 @@ obj- :=
# Core support for EXYNOS4 system

obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o
-obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o gpiolib.o irq-eint.o dma.o
+obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d3b2953..7938449 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -75,6 +75,12 @@ config GPIO_BASIC_MMIO
help
Say yes here to support basic memory-mapped GPIO controllers.

+config GPIO_EXYNOS4
+ bool "Samsung Exynos4 GPIO support"
+ depends on CPU_EXYNOS4210
+ help
+ Say yes here to support Samsung Exynos4 GPIO controllers.
+
config GPIO_IT8761E
tristate "IT8761E GPIO support"
depends on GPIOLIB
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index becef59..f2373d0 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_GPIOLIB) += gpiolib.o
obj-$(CONFIG_GPIO_ADP5520) += adp5520-gpio.o
obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o
obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o
+obj-$(CONFIG_GPIO_EXYNOS4) += exynos4-gpio.o
obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o
obj-$(CONFIG_GPIO_MAX730X) += max730x.o
obj-$(CONFIG_GPIO_MAX7300) += max7300.o

2011-05-26 20:32:07

by Grant Likely

Subject: Re: [PATCH] Exynos4: Move GPIO drivers to drivers/gpio

On Wed, May 18, 2011 at 08:55:36PM +0900, Kyungmin Park wrote:
> From: Kyungmin Park <[email protected]>
>
> Samsung Exynos4 gpio driver moved to drivers/gpio.
>
> Cc: Arnd Bergmann <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>

Applied, thanks
g.

> ---
> diff --git a/arch/arm/mach-exynos4/gpiolib.c b/drivers/gpio/exynos4-gpio.c
> similarity index 100%
> rename from arch/arm/mach-exynos4/gpiolib.c
> rename to drivers/gpio/exynos4-gpio.c
> diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
> index 9be104f..3bb3f57 100644
> --- a/arch/arm/mach-exynos4/Makefile
> +++ b/arch/arm/mach-exynos4/Makefile
> @@ -13,7 +13,7 @@ obj- :=
> # Core support for EXYNOS4 system
>
> obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o
> -obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o gpiolib.o irq-eint.o dma.o
> +obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
> obj-$(CONFIG_PM) += pm.o sleep.o
> obj-$(CONFIG_CPU_FREQ) += cpufreq.o
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index d3b2953..7938449 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -75,6 +75,12 @@ config GPIO_BASIC_MMIO
> help
> Say yes here to support basic memory-mapped GPIO controllers.
>
> +config GPIO_EXYNOS4
> + bool "Samsung Exynos4 GPIO support"
> + depends on CPU_EXYNOS4210
> + help
> + Say yes here to support Samsung Exynos4 GPIO controllers.
> +
> config GPIO_IT8761E
> tristate "IT8761E GPIO support"
> depends on GPIOLIB
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index becef59..f2373d0 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -11,6 +11,7 @@ obj-$(CONFIG_GPIOLIB) += gpiolib.o
> obj-$(CONFIG_GPIO_ADP5520) += adp5520-gpio.o
> obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o
> obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o
> +obj-$(CONFIG_GPIO_EXYNOS4) += exynos4-gpio.o
> obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o
> obj-$(CONFIG_GPIO_MAX730X) += max730x.o
> obj-$(CONFIG_GPIO_MAX7300) += max7300.o