From f80cb526e301ab625dd04f6137f9995607348ce3 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 22 Aug 2011 08:44:45 +0100 Subject: [PATCH] ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem As per example from the other ARM boards, push the LPC32XX GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Wolfram Sang Cc: Barry Song Signed-off-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mach-lpc32xx/Makefile | 2 +- drivers/gpio/Makefile | 1 + arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%) diff --git a/arch/arm/mach-lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile index a5fc5d0..f5db805 100644 --- a/arch/arm/mach-lpc32xx/Makefile +++ b/arch/arm/mach-lpc32xx/Makefile @@ -3,6 +3,6 @@ # obj-y := timer.o irq.o common.o serial.o clock.o -obj-y += gpiolib.o pm.o suspend.o +obj-y += pm.o suspend.o obj-y += phy3250.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 2269822..33e095bd 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o +obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o diff --git a/arch/arm/mach-lpc32xx/gpiolib.c b/drivers/gpio/gpio-lpc32xx.c similarity index 99% rename from arch/arm/mach-lpc32xx/gpiolib.c rename to drivers/gpio/gpio-lpc32xx.c index 69061ea..b4e9d35 100644 --- a/arch/arm/mach-lpc32xx/gpiolib.c +++ b/drivers/gpio/gpio-lpc32xx.c @@ -24,7 +24,6 @@ #include #include -#include "common.h" #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004) -- 2.7.4