Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually

2 files changed, 101 insertions, 120 deletions

diff --git a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h b/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h
new file mode 100644
index 000000000000..8aff2ea35877
--- /dev/null
+++ b/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h
@@ -0,0 +1,100 @@
+/* Include file for the EP93XX GPIO controller machine specifics */
+
+#ifndef __GPIO_EP93XX_H
+#define __GPIO_EP93XX_H
+
+/* GPIO port A.  */
+#define EP93XX_GPIO_LINE_A(x)           ((x) + 0)
+#define EP93XX_GPIO_LINE_EGPIO0         EP93XX_GPIO_LINE_A(0)
+#define EP93XX_GPIO_LINE_EGPIO1         EP93XX_GPIO_LINE_A(1)
+#define EP93XX_GPIO_LINE_EGPIO2         EP93XX_GPIO_LINE_A(2)
+#define EP93XX_GPIO_LINE_EGPIO3         EP93XX_GPIO_LINE_A(3)
+#define EP93XX_GPIO_LINE_EGPIO4         EP93XX_GPIO_LINE_A(4)
+#define EP93XX_GPIO_LINE_EGPIO5         EP93XX_GPIO_LINE_A(5)
+#define EP93XX_GPIO_LINE_EGPIO6         EP93XX_GPIO_LINE_A(6)
+#define EP93XX_GPIO_LINE_EGPIO7         EP93XX_GPIO_LINE_A(7)
+
+/* GPIO port B.  */
+#define EP93XX_GPIO_LINE_B(x)           ((x) + 8)
+#define EP93XX_GPIO_LINE_EGPIO8         EP93XX_GPIO_LINE_B(0)
+#define EP93XX_GPIO_LINE_EGPIO9         EP93XX_GPIO_LINE_B(1)
+#define EP93XX_GPIO_LINE_EGPIO10        EP93XX_GPIO_LINE_B(2)
+#define EP93XX_GPIO_LINE_EGPIO11        EP93XX_GPIO_LINE_B(3)
+#define EP93XX_GPIO_LINE_EGPIO12        EP93XX_GPIO_LINE_B(4)
+#define EP93XX_GPIO_LINE_EGPIO13        EP93XX_GPIO_LINE_B(5)
+#define EP93XX_GPIO_LINE_EGPIO14        EP93XX_GPIO_LINE_B(6)
+#define EP93XX_GPIO_LINE_EGPIO15        EP93XX_GPIO_LINE_B(7)
+
+/* GPIO port C.  */
+#define EP93XX_GPIO_LINE_C(x)           ((x) + 40)
+#define EP93XX_GPIO_LINE_ROW0           EP93XX_GPIO_LINE_C(0)
+#define EP93XX_GPIO_LINE_ROW1           EP93XX_GPIO_LINE_C(1)
+#define EP93XX_GPIO_LINE_ROW2           EP93XX_GPIO_LINE_C(2)
+#define EP93XX_GPIO_LINE_ROW3           EP93XX_GPIO_LINE_C(3)
+#define EP93XX_GPIO_LINE_ROW4           EP93XX_GPIO_LINE_C(4)
+#define EP93XX_GPIO_LINE_ROW5           EP93XX_GPIO_LINE_C(5)
+#define EP93XX_GPIO_LINE_ROW6           EP93XX_GPIO_LINE_C(6)
+#define EP93XX_GPIO_LINE_ROW7           EP93XX_GPIO_LINE_C(7)
+
+/* GPIO port D.  */
+#define EP93XX_GPIO_LINE_D(x)           ((x) + 24)
+#define EP93XX_GPIO_LINE_COL0           EP93XX_GPIO_LINE_D(0)
+#define EP93XX_GPIO_LINE_COL1           EP93XX_GPIO_LINE_D(1)
+#define EP93XX_GPIO_LINE_COL2           EP93XX_GPIO_LINE_D(2)
+#define EP93XX_GPIO_LINE_COL3           EP93XX_GPIO_LINE_D(3)
+#define EP93XX_GPIO_LINE_COL4           EP93XX_GPIO_LINE_D(4)
+#define EP93XX_GPIO_LINE_COL5           EP93XX_GPIO_LINE_D(5)
+#define EP93XX_GPIO_LINE_COL6           EP93XX_GPIO_LINE_D(6)
+#define EP93XX_GPIO_LINE_COL7           EP93XX_GPIO_LINE_D(7)
+
+/* GPIO port E.  */
+#define EP93XX_GPIO_LINE_E(x)           ((x) + 32)
+#define EP93XX_GPIO_LINE_GRLED          EP93XX_GPIO_LINE_E(0)
+#define EP93XX_GPIO_LINE_RDLED          EP93XX_GPIO_LINE_E(1)
+#define EP93XX_GPIO_LINE_DIORn          EP93XX_GPIO_LINE_E(2)
+#define EP93XX_GPIO_LINE_IDECS1n        EP93XX_GPIO_LINE_E(3)
+#define EP93XX_GPIO_LINE_IDECS2n        EP93XX_GPIO_LINE_E(4)
+#define EP93XX_GPIO_LINE_IDEDA0         EP93XX_GPIO_LINE_E(5)
+#define EP93XX_GPIO_LINE_IDEDA1         EP93XX_GPIO_LINE_E(6)
+#define EP93XX_GPIO_LINE_IDEDA2         EP93XX_GPIO_LINE_E(7)
+
+/* GPIO port F.  */
+#define EP93XX_GPIO_LINE_F(x)           ((x) + 16)
+#define EP93XX_GPIO_LINE_WP             EP93XX_GPIO_LINE_F(0)
+#define EP93XX_GPIO_LINE_MCCD1          EP93XX_GPIO_LINE_F(1)
+#define EP93XX_GPIO_LINE_MCCD2          EP93XX_GPIO_LINE_F(2)
+#define EP93XX_GPIO_LINE_MCBVD1         EP93XX_GPIO_LINE_F(3)
+#define EP93XX_GPIO_LINE_MCBVD2         EP93XX_GPIO_LINE_F(4)
+#define EP93XX_GPIO_LINE_VS1            EP93XX_GPIO_LINE_F(5)
+#define EP93XX_GPIO_LINE_READY          EP93XX_GPIO_LINE_F(6)
+#define EP93XX_GPIO_LINE_VS2            EP93XX_GPIO_LINE_F(7)
+
+/* GPIO port G.  */
+#define EP93XX_GPIO_LINE_G(x)           ((x) + 48)
+#define EP93XX_GPIO_LINE_EECLK          EP93XX_GPIO_LINE_G(0)
+#define EP93XX_GPIO_LINE_EEDAT          EP93XX_GPIO_LINE_G(1)
+#define EP93XX_GPIO_LINE_SLA0           EP93XX_GPIO_LINE_G(2)
+#define EP93XX_GPIO_LINE_SLA1           EP93XX_GPIO_LINE_G(3)
+#define EP93XX_GPIO_LINE_DD12           EP93XX_GPIO_LINE_G(4)
+#define EP93XX_GPIO_LINE_DD13           EP93XX_GPIO_LINE_G(5)
+#define EP93XX_GPIO_LINE_DD14           EP93XX_GPIO_LINE_G(6)
+#define EP93XX_GPIO_LINE_DD15           EP93XX_GPIO_LINE_G(7)
+
+/* GPIO port H.  */
+#define EP93XX_GPIO_LINE_H(x)           ((x) + 56)
+#define EP93XX_GPIO_LINE_DD0            EP93XX_GPIO_LINE_H(0)
+#define EP93XX_GPIO_LINE_DD1            EP93XX_GPIO_LINE_H(1)
+#define EP93XX_GPIO_LINE_DD2            EP93XX_GPIO_LINE_H(2)
+#define EP93XX_GPIO_LINE_DD3            EP93XX_GPIO_LINE_H(3)
+#define EP93XX_GPIO_LINE_DD4            EP93XX_GPIO_LINE_H(4)
+#define EP93XX_GPIO_LINE_DD5            EP93XX_GPIO_LINE_H(5)
+#define EP93XX_GPIO_LINE_DD6            EP93XX_GPIO_LINE_H(6)
+#define EP93XX_GPIO_LINE_DD7            EP93XX_GPIO_LINE_H(7)
+
+/* maximum value for gpio line identifiers */
+#define EP93XX_GPIO_LINE_MAX            EP93XX_GPIO_LINE_H(7)
+
+/* maximum value for irq capable line identifiers */
+#define EP93XX_GPIO_LINE_MAX_IRQ        EP93XX_GPIO_LINE_F(7)
+
+#endif /* __GPIO_EP93XX_H */
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h
index c57152c231f1..40a8c178f10d 100644
--- a/arch/arm/mach-ep93xx/include/mach/gpio.h
+++ b/arch/arm/mach-ep93xx/include/mach/gpio.h
@@ -1,120 +1 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/gpio.h
- */
-
-#ifndef __ASM_ARCH_GPIO_H
-#define __ASM_ARCH_GPIO_H
-
-/* GPIO port A.  */
-#define EP93XX_GPIO_LINE_A(x)           ((x) + 0)
-#define EP93XX_GPIO_LINE_EGPIO0         EP93XX_GPIO_LINE_A(0)
-#define EP93XX_GPIO_LINE_EGPIO1         EP93XX_GPIO_LINE_A(1)
-#define EP93XX_GPIO_LINE_EGPIO2         EP93XX_GPIO_LINE_A(2)
-#define EP93XX_GPIO_LINE_EGPIO3         EP93XX_GPIO_LINE_A(3)
-#define EP93XX_GPIO_LINE_EGPIO4         EP93XX_GPIO_LINE_A(4)
-#define EP93XX_GPIO_LINE_EGPIO5         EP93XX_GPIO_LINE_A(5)
-#define EP93XX_GPIO_LINE_EGPIO6         EP93XX_GPIO_LINE_A(6)
-#define EP93XX_GPIO_LINE_EGPIO7         EP93XX_GPIO_LINE_A(7)
-
-/* GPIO port B.  */
-#define EP93XX_GPIO_LINE_B(x)           ((x) + 8)
-#define EP93XX_GPIO_LINE_EGPIO8         EP93XX_GPIO_LINE_B(0)
-#define EP93XX_GPIO_LINE_EGPIO9         EP93XX_GPIO_LINE_B(1)
-#define EP93XX_GPIO_LINE_EGPIO10        EP93XX_GPIO_LINE_B(2)
-#define EP93XX_GPIO_LINE_EGPIO11        EP93XX_GPIO_LINE_B(3)
-#define EP93XX_GPIO_LINE_EGPIO12        EP93XX_GPIO_LINE_B(4)
-#define EP93XX_GPIO_LINE_EGPIO13        EP93XX_GPIO_LINE_B(5)
-#define EP93XX_GPIO_LINE_EGPIO14        EP93XX_GPIO_LINE_B(6)
-#define EP93XX_GPIO_LINE_EGPIO15        EP93XX_GPIO_LINE_B(7)
-
-/* GPIO port C.  */
-#define EP93XX_GPIO_LINE_C(x)           ((x) + 40)
-#define EP93XX_GPIO_LINE_ROW0           EP93XX_GPIO_LINE_C(0)
-#define EP93XX_GPIO_LINE_ROW1           EP93XX_GPIO_LINE_C(1)
-#define EP93XX_GPIO_LINE_ROW2           EP93XX_GPIO_LINE_C(2)
-#define EP93XX_GPIO_LINE_ROW3           EP93XX_GPIO_LINE_C(3)
-#define EP93XX_GPIO_LINE_ROW4           EP93XX_GPIO_LINE_C(4)
-#define EP93XX_GPIO_LINE_ROW5           EP93XX_GPIO_LINE_C(5)
-#define EP93XX_GPIO_LINE_ROW6           EP93XX_GPIO_LINE_C(6)
-#define EP93XX_GPIO_LINE_ROW7           EP93XX_GPIO_LINE_C(7)
-
-/* GPIO port D.  */
-#define EP93XX_GPIO_LINE_D(x)           ((x) + 24)
-#define EP93XX_GPIO_LINE_COL0           EP93XX_GPIO_LINE_D(0)
-#define EP93XX_GPIO_LINE_COL1           EP93XX_GPIO_LINE_D(1)
-#define EP93XX_GPIO_LINE_COL2           EP93XX_GPIO_LINE_D(2)
-#define EP93XX_GPIO_LINE_COL3           EP93XX_GPIO_LINE_D(3)
-#define EP93XX_GPIO_LINE_COL4           EP93XX_GPIO_LINE_D(4)
-#define EP93XX_GPIO_LINE_COL5           EP93XX_GPIO_LINE_D(5)
-#define EP93XX_GPIO_LINE_COL6           EP93XX_GPIO_LINE_D(6)
-#define EP93XX_GPIO_LINE_COL7           EP93XX_GPIO_LINE_D(7)
-
-/* GPIO port E.  */
-#define EP93XX_GPIO_LINE_E(x)           ((x) + 32)
-#define EP93XX_GPIO_LINE_GRLED          EP93XX_GPIO_LINE_E(0)
-#define EP93XX_GPIO_LINE_RDLED          EP93XX_GPIO_LINE_E(1)
-#define EP93XX_GPIO_LINE_DIORn          EP93XX_GPIO_LINE_E(2)
-#define EP93XX_GPIO_LINE_IDECS1n        EP93XX_GPIO_LINE_E(3)
-#define EP93XX_GPIO_LINE_IDECS2n        EP93XX_GPIO_LINE_E(4)
-#define EP93XX_GPIO_LINE_IDEDA0         EP93XX_GPIO_LINE_E(5)
-#define EP93XX_GPIO_LINE_IDEDA1         EP93XX_GPIO_LINE_E(6)
-#define EP93XX_GPIO_LINE_IDEDA2         EP93XX_GPIO_LINE_E(7)
-
-/* GPIO port F.  */
-#define EP93XX_GPIO_LINE_F(x)           ((x) + 16)
-#define EP93XX_GPIO_LINE_WP             EP93XX_GPIO_LINE_F(0)
-#define EP93XX_GPIO_LINE_MCCD1          EP93XX_GPIO_LINE_F(1)
-#define EP93XX_GPIO_LINE_MCCD2          EP93XX_GPIO_LINE_F(2)
-#define EP93XX_GPIO_LINE_MCBVD1         EP93XX_GPIO_LINE_F(3)
-#define EP93XX_GPIO_LINE_MCBVD2         EP93XX_GPIO_LINE_F(4)
-#define EP93XX_GPIO_LINE_VS1            EP93XX_GPIO_LINE_F(5)
-#define EP93XX_GPIO_LINE_READY          EP93XX_GPIO_LINE_F(6)
-#define EP93XX_GPIO_LINE_VS2            EP93XX_GPIO_LINE_F(7)
-
-/* GPIO port G.  */
-#define EP93XX_GPIO_LINE_G(x)           ((x) + 48)
-#define EP93XX_GPIO_LINE_EECLK          EP93XX_GPIO_LINE_G(0)
-#define EP93XX_GPIO_LINE_EEDAT          EP93XX_GPIO_LINE_G(1)
-#define EP93XX_GPIO_LINE_SLA0           EP93XX_GPIO_LINE_G(2)
-#define EP93XX_GPIO_LINE_SLA1           EP93XX_GPIO_LINE_G(3)
-#define EP93XX_GPIO_LINE_DD12           EP93XX_GPIO_LINE_G(4)
-#define EP93XX_GPIO_LINE_DD13           EP93XX_GPIO_LINE_G(5)
-#define EP93XX_GPIO_LINE_DD14           EP93XX_GPIO_LINE_G(6)
-#define EP93XX_GPIO_LINE_DD15           EP93XX_GPIO_LINE_G(7)
-
-/* GPIO port H.  */
-#define EP93XX_GPIO_LINE_H(x)           ((x) + 56)
-#define EP93XX_GPIO_LINE_DD0            EP93XX_GPIO_LINE_H(0)
-#define EP93XX_GPIO_LINE_DD1            EP93XX_GPIO_LINE_H(1)
-#define EP93XX_GPIO_LINE_DD2            EP93XX_GPIO_LINE_H(2)
-#define EP93XX_GPIO_LINE_DD3            EP93XX_GPIO_LINE_H(3)
-#define EP93XX_GPIO_LINE_DD4            EP93XX_GPIO_LINE_H(4)
-#define EP93XX_GPIO_LINE_DD5            EP93XX_GPIO_LINE_H(5)
-#define EP93XX_GPIO_LINE_DD6            EP93XX_GPIO_LINE_H(6)
-#define EP93XX_GPIO_LINE_DD7            EP93XX_GPIO_LINE_H(7)
-
-/* maximum value for gpio line identifiers */
-#define EP93XX_GPIO_LINE_MAX            EP93XX_GPIO_LINE_H(7)
-
-/* maximum value for irq capable line identifiers */
-#define EP93XX_GPIO_LINE_MAX_IRQ        EP93XX_GPIO_LINE_F(7)
-
-/* new generic GPIO API - see Documentation/gpio.txt */
-
-#include <asm-generic/gpio.h>
-
-#define gpio_get_value  __gpio_get_value
-#define gpio_set_value  __gpio_set_value
-#define gpio_cansleep   __gpio_cansleep
-
-/*
- * Map GPIO A0..A7  (0..7)  to irq 64..71,
- *          B0..B7  (7..15) to irq 72..79, and
- *          F0..F7 (16..24) to irq 80..87.
- */
-#define gpio_to_irq(gpio)       \
-        (((gpio) <= EP93XX_GPIO_LINE_MAX_IRQ) ? (64 + (gpio)) : -EINVAL)
-
-#define irq_to_gpio(irq)        ((irq) - gpio_to_irq(0))
-
-#endif
+/* empty */