Message ID | 1312978689-18539-1-git-send-email-linus.walleij@stericsson.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Aug 10, 2011 at 8:18 PM, Linus Walleij <linus.walleij@stericsson.com> wrote: > From: Linus Walleij <linus.walleij@linaro.org> > > As per example from the other ARM boards, push the PXA > GPIO driver down to the GPIO subsystem so it can be consolidated. > > Cc: Eric Miao <eric.y.miao@gmail.com> > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> This one looks OK. > --- > arch/arm/plat-pxa/Makefile | 1 - > drivers/gpio/Makefile | 1 + > .../arm/plat-pxa/gpio.c => drivers/gpio/gpio-pxa.c | 0 > 3 files changed, 1 insertions(+), 1 deletions(-) > rename arch/arm/plat-pxa/gpio.c => drivers/gpio/gpio-pxa.c (100%) > > diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile > index 3aca5ba..f302d04 100644 > --- a/arch/arm/plat-pxa/Makefile > +++ b/arch/arm/plat-pxa/Makefile > @@ -4,7 +4,6 @@ > > obj-y := dma.o > > -obj-$(CONFIG_GENERIC_GPIO) += gpio.o > obj-$(CONFIG_PXA3xx) += mfp.o > obj-$(CONFIG_PXA95x) += mfp.o > obj-$(CONFIG_ARCH_MMP) += mfp.o > diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile > index 33e095bd..6640e1d 100644 > --- a/drivers/gpio/Makefile > +++ b/drivers/gpio/Makefile > @@ -40,6 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o > obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o > obj-$(CONFIG_GPIO_PCH) += gpio-pch.o > obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o > +obj-$(CONFIG_PLAT_PXA) += gpio-pxa.o > obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o > > obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o > diff --git a/arch/arm/plat-pxa/gpio.c b/drivers/gpio/gpio-pxa.c > similarity index 100% > rename from arch/arm/plat-pxa/gpio.c > rename to drivers/gpio/gpio-pxa.c > -- > 1.7.3.2 > >
diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index 3aca5ba..f302d04 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile @@ -4,7 +4,6 @@ obj-y := dma.o -obj-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_PXA95x) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 33e095bd..6640e1d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o +obj-$(CONFIG_PLAT_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o