ixp4xx: fix compilation by adding gpiolib support

Once again, ixp4xx no longer even compiles. This patch fixes the issue
by converting over to gpiolib. This patch was first made by Imre and
posted by Marc, and I added in Russell's suggestion to empty the gpio
header file.

This fix should also go for 3.1, 3.2, 3.3, and 3.4.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 46 insertions, 2 deletions

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index ebbd7fc90eb4..a9f80943d01f 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -28,6 +28,7 @@
 #include <linux/clockchips.h>
 #include <linux/io.h>
 #include <linux/export.h>
+#include <linux/gpio.h>
 
 #include <mach/udc.h>
 #include <mach/hardware.h>
@@ -107,7 +108,7 @@ static signed char irq2gpio[32] = {
          7,  8,  9, 10, 11, 12, -1, -1,
 };
 
-int gpio_to_irq(int gpio)
+static int ixp4xx_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
 {
         int irq;
 
@@ -117,7 +118,6 @@ int gpio_to_irq(int gpio)
         }
         return -EINVAL;
 }
-EXPORT_SYMBOL(gpio_to_irq);
 
 int irq_to_gpio(unsigned int irq)
 {
@@ -383,12 +383,56 @@ static struct platform_device *ixp46x_devices[] __initdata = {
 unsigned long ixp4xx_exp_bus_size;
 EXPORT_SYMBOL(ixp4xx_exp_bus_size);
 
+static int ixp4xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+        gpio_line_config(gpio, IXP4XX_GPIO_IN);
+
+        return 0;
+}
+
+static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
+                                        int level)
+{
+        gpio_line_set(gpio, level);
+        gpio_line_config(gpio, IXP4XX_GPIO_OUT);
+
+        return 0;
+}
+
+static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
+{
+        int value;
+
+        gpio_line_get(gpio, &value);
+
+        return value;
+}
+
+static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio,
+                                  int value)
+{
+        gpio_line_set(gpio, value);
+}
+
+static struct gpio_chip ixp4xx_gpio_chip = {
+        .label                  = "IXP4XX_GPIO_CHIP",
+        .direction_input        = ixp4xx_gpio_direction_input,
+        .direction_output       = ixp4xx_gpio_direction_output,
+        .get                    = ixp4xx_gpio_get_value,
+        .set                    = ixp4xx_gpio_set_value,
+        .to_irq                 = ixp4xx_gpio_to_irq,
+        .base                   = 0,
+        .ngpio                  = 16,
+};
+
 void __init ixp4xx_sys_init(void)
 {
         ixp4xx_exp_bus_size = SZ_16M;
 
         platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
 
+        gpiochip_add(&ixp4xx_gpio_chip);
+
         if (cpu_is_ixp46x()) {
                 int region;