2011-05-24 21:07:13

by Linus Walleij

Subject: [PATCH 2/4] gpio: move Nomadik GPIO driver to drivers/gpio

From: Linus Walleij <[email protected]>

This moves the Nomadik GPIO driver out of arch/arm/plat-nomadik
and into the desired location indicated by the subsystem
maintainer.

Signed-off-by: Linus Walleij <[email protected]>
---
arch/arm/plat-nomadik/Kconfig | 5 -----
arch/arm/plat-nomadik/Makefile | 1 -
drivers/gpio/Makefile | 1 +
.../gpio.c => drivers/gpio/gpio-nomadik.c | 0
4 files changed, 1 insertions(+), 6 deletions(-)
rename arch/arm/plat-nomadik/gpio.c => drivers/gpio/gpio-nomadik.c (100%)

diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index 18296ee..ce65901 100644
--- a/arch/arm/plat-nomadik/Kconfig
+++ b/arch/arm/plat-nomadik/Kconfig
@@ -21,9 +21,4 @@ config HAS_MTU
to multiple interrupt generating programmable
32-bit free running decrementing counters.

-config NOMADIK_GPIO
- bool
- help
- Support for the Nomadik GPIO controller.
-
endif
diff --git a/arch/arm/plat-nomadik/Makefile b/arch/arm/plat-nomadik/Makefile
index c335473..37c7cdd 100644
--- a/arch/arm/plat-nomadik/Makefile
+++ b/arch/arm/plat-nomadik/Makefile
@@ -3,4 +3,3 @@
# Licensed under GPLv2

obj-$(CONFIG_HAS_MTU) += timer.o
-obj-$(CONFIG_NOMADIK_GPIO) += gpio.o
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 7245d7d..6c2c3ad 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_GPIO_WM8350) += wm8350-gpiolib.o
obj-$(CONFIG_GPIO_WM8994) += wm8994-gpio.o
obj-$(CONFIG_GPIO_SCH) += sch_gpio.o
obj-$(CONFIG_MACH_U300) += gpio-u300.o
+obj-$(CONFIG_PLAT_NOMADIK) += gpio-nomadik.o
obj-$(CONFIG_GPIO_RDC321X) += rdc321x-gpio.o
obj-$(CONFIG_GPIO_JANZ_TTL) += janz-ttl.o
obj-$(CONFIG_GPIO_SX150X) += sx150x.o
diff --git a/arch/arm/plat-nomadik/gpio.c b/drivers/gpio/gpio-nomadik.c
similarity index 100%
rename from arch/arm/plat-nomadik/gpio.c
rename to drivers/gpio/gpio-nomadik.c
--
1.7.3.2

2011-05-24 23:06:03

by Russell King - ARM Linux

Subject: Re: [PATCH 2/4] gpio: move Nomadik GPIO driver to drivers/gpio

On Tue, May 24, 2011 at 11:07:01PM +0200, Linus Walleij wrote:
> -config NOMADIK_GPIO
> - bool
> - help
> - Support for the Nomadik GPIO controller.
> -

What about the statements which select this config symbol?

2011-05-25 08:12:54

by Linus Walleij

Subject: Re: [PATCH 2/4] gpio: move Nomadik GPIO driver to drivers/gpio

2011/5/25 Russell King - ARM Linux <[email protected]>:

> On Tue, May 24, 2011 at 11:07:01PM +0200, Linus Walleij wrote:
>> -config NOMADIK_GPIO
>> - ? ? bool
>> - ? ? help
>> - ? ? ? Support for the Nomadik GPIO controller.
>> -
>
> What about the statements which select this config symbol?

Ayes, thanks a lot Russell, I've sent a separate patch deleting these.

Yours,
Linus Walleij