ARM: ixp4xx: convert remaining users to use gpiolib

A few call sites inside mach-ixp4xx were still using the custom
ixp4xx GPIO API with gpio_line_* accessors, convert all these
to use the standard gpiolib functions instead. Also attempt to
request and label all GPIOs before use. Move the GPIO requests
to per-machine device_initcalls() so we are not dependent on the
GPIO chip to be available at machine_init time.

Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 63de1b3fd06bf0327549cf7670761ac7bccf7298..736dc692d54047b7f56e0b409fda416662252ad1 100644 (file)
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -26,6 +26,7 @@
 #include <linux/reboot.h>
 #include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 
@@ -161,11 +162,8 @@ static struct platform_device *dsmg600_devices[] __initdata = {
 
 static void dsmg600_power_off(void)
 {
-       /* enable the pwr cntl gpio */
-       gpio_line_config(DSMG600_PO_GPIO, IXP4XX_GPIO_OUT);
-
-       /* poweroff */
-       gpio_line_set(DSMG600_PO_GPIO, IXP4XX_GPIO_HIGH);
+       /* enable the pwr cntl and drive it high */
+       gpio_direction_output(DSMG600_PO_GPIO, 1);
 }
 
 /* This is used to make sure the power-button pusher is serious.  The button
@@ -202,7 +200,7 @@ static void dsmg600_power_handler(unsigned long data)
                        ctrl_alt_del();
 
                        /* Change the state of the power LED to "blink" */
-                       gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW);
+                       gpio_set_value(DSMG600_LED_PWR_GPIO, 0);
                } else {
                        power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
                }
@@ -228,6 +226,40 @@ static void __init dsmg600_timer_init(void)
     ixp4xx_timer_init();
 }
 
+static int __init dsmg600_gpio_init(void)
+{
+       if (!machine_is_dsmg600())
+               return 0;
+
+       gpio_request(DSMG600_RB_GPIO, "reset button");
+       if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,
+               IRQF_DISABLED | IRQF_TRIGGER_LOW,
+               "DSM-G600 reset button", NULL) < 0) {
+
+               printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
+                       gpio_to_irq(DSMG600_RB_GPIO));
+       }
+
+       /*
+        * The power button on the D-Link DSM-G600 is on GPIO 15, but
+        * it cannot handle interrupts on that GPIO line.  So we'll
+        * have to poll it with a kernel timer.
+        */
+
+       /* Make sure that the power button GPIO is set up as an input */
+       gpio_request(DSMG600_PB_GPIO, "power button");
+       gpio_direction_input(DSMG600_PB_GPIO);
+       /* Request poweroff GPIO line */
+       gpio_request(DSMG600_PO_GPIO, "power off button");
+
+       /* Set the initial value for the power button IRQ handler */
+       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
+
+       mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
+       return 0;
+}
+device_initcall(dsmg600_gpio_init);
+
 static void __init dsmg600_init(void)
 {
        ixp4xx_sys_init();
@@ -251,27 +283,6 @@ static void __init dsmg600_init(void)
        platform_add_devices(dsmg600_devices, ARRAY_SIZE(dsmg600_devices));
 
        pm_power_off = dsmg600_power_off;
-
-       if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,
-               IRQF_DISABLED | IRQF_TRIGGER_LOW,
-               "DSM-G600 reset button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
-                       gpio_to_irq(DSMG600_RB_GPIO));
-       }
-
-       /* The power button on the D-Link DSM-G600 is on GPIO 15, but
-        * it cannot handle interrupts on that GPIO line.  So we'll
-        * have to poll it with a kernel timer.
-        */
-
-       /* Make sure that the power button GPIO is set up as an input */
-       gpio_line_config(DSMG600_PB_GPIO, IXP4XX_GPIO_IN);
-
-       /* Set the initial value for the power button IRQ handler */
-       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
-
-       mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
 }
 
 MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 22d688b7d51302a711ac75f67e5fc909a9abcd1f..e7b8befa872950c43d7289e12f49ae7850d6c3c9 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -20,6 +20,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -80,10 +81,10 @@ ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 
        if (ctrl & NAND_CTRL_CHANGE) {
                if (ctrl & NAND_NCE) {
-                       gpio_line_set(IXDP425_NAND_NCE_PIN, IXP4XX_GPIO_LOW);
+                       gpio_set_value(IXDP425_NAND_NCE_PIN, 0);
                        udelay(5);
                } else
-                       gpio_line_set(IXDP425_NAND_NCE_PIN, IXP4XX_GPIO_HIGH);
+                       gpio_set_value(IXDP425_NAND_NCE_PIN, 1);
 
                offset = (ctrl & NAND_CLE) ? IXDP425_NAND_CMD_BYTE : 0;
                offset |= (ctrl & NAND_ALE) ? IXDP425_NAND_ADDR_BYTE : 0;
@@ -227,7 +228,8 @@ static void __init ixdp425_init(void)
        ixdp425_flash_nand_resource.start = IXP4XX_EXP_BUS_BASE(3),
        ixdp425_flash_nand_resource.end   = IXP4XX_EXP_BUS_BASE(3) + 0x10 - 1;
 
-       gpio_line_config(IXDP425_NAND_NCE_PIN, IXP4XX_GPIO_OUT);
+       gpio_request(IXDP425_NAND_NCE_PIN, "NAND NCE pin");
+       gpio_direction_output(IXDP425_NAND_NCE_PIN, 0);
 
        /* Configure expansion bus for NAND Flash */
        *IXP4XX_EXP_CS3 = IXP4XX_EXP_BUS_CS_EN |

diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index ed667ce9f576a8548978b0faa7b5e5d5776687e4..507cb52335373eb3d8857cb2c2380b4e642b7baf 100644 (file)
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -184,11 +184,8 @@ static void nas100d_power_off(void)
 {
        /* This causes the box to drop the power and go dead. */
 
-       /* enable the pwr cntl gpio */
-       gpio_line_config(NAS100D_PO_GPIO, IXP4XX_GPIO_OUT);
-
-       /* do the deed */
-       gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH);
+       /* enable the pwr cntl gpio and assert power off */
+       gpio_direction_output(NAS100D_PO_GPIO, 1);
 }
 
 /* This is used to make sure the power-button pusher is serious.  The button
@@ -225,7 +222,7 @@ static void nas100d_power_handler(unsigned long data)
                        ctrl_alt_del();
 
                        /* Change the state of the power LED to "blink" */
-                       gpio_line_set(NAS100D_LED_PWR_GPIO, IXP4XX_GPIO_LOW);
+                       gpio_set_value(NAS100D_LED_PWR_GPIO, 0);
                } else {
                        power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
                }
@@ -242,6 +239,33 @@ static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+static int __init nas100d_gpio_init(void)
+{
+       if (!machine_is_nas100d())
+               return 0;
+
+       /*
+        * The power button on the Iomega NAS100d is on GPIO 14, but
+        * it cannot handle interrupts on that GPIO line.  So we'll
+        * have to poll it with a kernel timer.
+        */
+
+       /* Request the power off GPIO */
+       gpio_request(NAS100D_PO_GPIO, "power off");
+
+       /* Make sure that the power button GPIO is set up as an input */
+       gpio_request(NAS100D_PB_GPIO, "power button");
+       gpio_direction_input(NAS100D_PB_GPIO);
+
+       /* Set the initial value for the power button IRQ handler */
+       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
+
+       mod_timer(&nas100d_power_timer, jiffies + msecs_to_jiffies(500));
+
+       return 0;
+}
+device_initcall(nas100d_gpio_init);
+
 static void __init nas100d_init(void)
 {
        uint8_t __iomem *f;
@@ -278,19 +302,6 @@ static void __init nas100d_init(void)
                        gpio_to_irq(NAS100D_RB_GPIO));
        }
 
-       /* The power button on the Iomega NAS100d is on GPIO 14, but
-        * it cannot handle interrupts on that GPIO line.  So we'll
-        * have to poll it with a kernel timer.
-        */
-
-       /* Make sure that the power button GPIO is set up as an input */
-       gpio_line_config(NAS100D_PB_GPIO, IXP4XX_GPIO_IN);
-
-       /* Set the initial value for the power button IRQ handler */
-       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
-
-       mod_timer(&nas100d_power_timer, jiffies + msecs_to_jiffies(500));
-
        /*
         * Map in a portion of the flash and read the MAC address.
         * Since it is stored in BE in the flash itself, we need to

diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index 7e55236c26eab3dea60ddfa2ef9eaacad17bd597..ba5f1cda2a9de20b00daf1f2bfb3e3ec3df6fb86 100644 (file)
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -197,11 +197,8 @@ static void nslu2_power_off(void)
 {
        /* This causes the box to drop the power and go dead. */
 
-       /* enable the pwr cntl gpio */
-       gpio_line_config(NSLU2_PO_GPIO, IXP4XX_GPIO_OUT);
-
-       /* do the deed */
-       gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
+       /* enable the pwr cntl gpio and assert power off */
+       gpio_direction_output(NSLU2_PO_GPIO, 1);
 }
 
 static irqreturn_t nslu2_power_handler(int irq, void *dev_id)
@@ -223,6 +220,16 @@ static irqreturn_t nslu2_reset_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+static int __init nslu2_gpio_init(void)
+{
+       if (!machine_is_nslu2())
+               return 0;
+
+       /* Request the power off GPIO */
+       return gpio_request(NSLU2_PO_GPIO, "power off");
+}
+device_initcall(nslu2_gpio_init);
+
 static void __init nslu2_timer_init(void)
 {
     /* The xtal on this machine is non-standard. */