Browse Source

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 <w.sang@pengutronix.de>
Cc: Barry Song <bs14@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Walleij 14 years ago
parent
commit
f80cb526e3
3 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/arm/mach-lpc32xx/Makefile
  2. 1 0
      drivers/gpio/Makefile
  3. 0 1
      drivers/gpio/gpio-lpc32xx.c

+ 1 - 1
arch/arm/mach-lpc32xx/Makefile

@@ -3,6 +3,6 @@
 #
 #
 
 
 obj-y	:= timer.o irq.o common.o serial.o clock.o
 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
 obj-y	+= phy3250.o
 
 

+ 1 - 0
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_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o
 obj-$(CONFIG_MACH_KS8695)	+= gpio-ks8695.o
 obj-$(CONFIG_MACH_KS8695)	+= gpio-ks8695.o
 obj-$(CONFIG_GPIO_LANGWELL)	+= gpio-langwell.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_MAX730X)	+= gpio-max730x.o
 obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
 obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
 obj-$(CONFIG_GPIO_MAX7301)	+= gpio-max7301.o
 obj-$(CONFIG_GPIO_MAX7301)	+= gpio-max7301.o

+ 0 - 1
arch/arm/mach-lpc32xx/gpiolib.c → drivers/gpio/gpio-lpc32xx.c

@@ -24,7 +24,6 @@
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 #include <mach/platform.h>
 #include <mach/platform.h>
-#include "common.h"
 
 
 #define LPC32XX_GPIO_P3_INP_STATE		_GPREG(0x000)
 #define LPC32XX_GPIO_P3_INP_STATE		_GPREG(0x000)
 #define LPC32XX_GPIO_P3_OUTP_SET		_GPREG(0x004)
 #define LPC32XX_GPIO_P3_OUTP_SET		_GPREG(0x004)