2 files changed, 37 insertions, 53 deletions

diff --git a/arch/mips/bcm47xx/gpio.c b/arch/mips/bcm47xx/gpio.c
index f5a53acf995a..9b798800258c 100644
--- a/arch/mips/bcm47xx/gpio.c
+++ b/arch/mips/bcm47xx/gpio.c
@@ -12,68 +12,51 @@
 #include <asm/mach-bcm47xx/bcm47xx.h>
 #include <asm/mach-bcm47xx/gpio.h>
 
-int bcm47xx_gpio_to_irq(unsigned gpio)
+#if (BCM47XX_CHIPCO_GPIO_LINES > BCM47XX_EXTIF_GPIO_LINES)
+static DECLARE_BITMAP(gpio_in_use, BCM47XX_CHIPCO_GPIO_LINES);
+#else
+static DECLARE_BITMAP(gpio_in_use, BCM47XX_EXTIF_GPIO_LINES);
+#endif
+
+int gpio_request(unsigned gpio, const char *tag)
 {
-        if (ssb_bcm47xx.chipco.dev)
-                return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2;
-        else if (ssb_bcm47xx.extif.dev)
-                return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2;
-        else
+        if (ssb_chipco_available(&ssb_bcm47xx.chipco) &&
+            ((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES))
                 return -EINVAL;
-}
-EXPORT_SYMBOL_GPL(bcm47xx_gpio_to_irq);
 
-int bcm47xx_gpio_get_value(unsigned gpio)
-{
-        if (ssb_bcm47xx.chipco.dev)
-                return ssb_chipco_gpio_in(&ssb_bcm47xx.chipco, 1 << gpio);
-        else if (ssb_bcm47xx.extif.dev)
-                return ssb_extif_gpio_in(&ssb_bcm47xx.extif, 1 << gpio);
-        else
-                return 0;
-}
-EXPORT_SYMBOL_GPL(bcm47xx_gpio_get_value);
+        if (ssb_extif_available(&ssb_bcm47xx.extif) &&
+            ((unsigned)gpio >= BCM47XX_EXTIF_GPIO_LINES))
+                return -EINVAL;
 
-void bcm47xx_gpio_set_value(unsigned gpio, int value)
-{
-        if (ssb_bcm47xx.chipco.dev)
-                ssb_chipco_gpio_out(&ssb_bcm47xx.chipco,
-                                    1 << gpio,
-                                    value ? 1 << gpio : 0);
-        else if (ssb_bcm47xx.extif.dev)
-                ssb_extif_gpio_out(&ssb_bcm47xx.extif,
-                                   1 << gpio,
-                                   value ? 1 << gpio : 0);
-}
-EXPORT_SYMBOL_GPL(bcm47xx_gpio_set_value);
+        if (test_and_set_bit(gpio, gpio_in_use))
+                return -EBUSY;
 
-int bcm47xx_gpio_direction_input(unsigned gpio)
-{
-        if (ssb_bcm47xx.chipco.dev && (gpio < BCM47XX_CHIPCO_GPIO_LINES))
-                ssb_chipco_gpio_outen(&ssb_bcm47xx.chipco,
-                                      1 << gpio, 0);
-        else if (ssb_bcm47xx.extif.dev && (gpio < BCM47XX_EXTIF_GPIO_LINES))
-                ssb_extif_gpio_outen(&ssb_bcm47xx.extif,
-                                     1 << gpio, 0);
-        else
-                return -EINVAL;
         return 0;
 }
-EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_input);
+EXPORT_SYMBOL(gpio_request);
 
-int bcm47xx_gpio_direction_output(unsigned gpio, int value)
+void gpio_free(unsigned gpio)
 {
-        bcm47xx_gpio_set_value(gpio, value);
+        if (ssb_chipco_available(&ssb_bcm47xx.chipco) &&
+            ((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES))
+                return;
+
+        if (ssb_extif_available(&ssb_bcm47xx.extif) &&
+            ((unsigned)gpio >= BCM47XX_EXTIF_GPIO_LINES))
+                return;
+
+        clear_bit(gpio, gpio_in_use);
+}
+EXPORT_SYMBOL(gpio_free);
 
-        if (ssb_bcm47xx.chipco.dev && (gpio < BCM47XX_CHIPCO_GPIO_LINES))
-                ssb_chipco_gpio_outen(&ssb_bcm47xx.chipco,
-                                      1 << gpio, 1 << gpio);
-        else if (ssb_bcm47xx.extif.dev && (gpio < BCM47XX_EXTIF_GPIO_LINES))
-                ssb_extif_gpio_outen(&ssb_bcm47xx.extif,
-                                     1 << gpio, 1 << gpio);
+int gpio_to_irq(unsigned gpio)
+{
+        if (ssb_chipco_available(&ssb_bcm47xx.chipco))
+                return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2;
+        else if (ssb_extif_available(&ssb_bcm47xx.extif))
+                return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2;
         else
                 return -EINVAL;
-        return 0;
 }
-EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output);
+EXPORT_SYMBOL_GPL(gpio_to_irq);
 
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 8d36f186890e..2f580fa160c9 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -27,6 +27,7 @@
 
 #include <linux/types.h>
 #include <linux/ssb/ssb.h>
+#include <linux/ssb/ssb_embedded.h>
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
@@ -41,7 +42,7 @@ static void bcm47xx_machine_restart(char *command)
         printk(KERN_ALERT "Please stand by while rebooting the system...\n");
         local_irq_disable();
         /* Set the watchdog timer to reset immediately */
-        ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 1);
+        ssb_watchdog_timer_set(&ssb_bcm47xx, 1);
         while (1)
                 cpu_relax();
 }
@@ -50,7 +51,7 @@ static void bcm47xx_machine_halt(void)
 {
         /* Disable interrupts and watchdog and spin forever */
         local_irq_disable();
-        ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 0);
+        ssb_watchdog_timer_set(&ssb_bcm47xx, 0);
         while (1)
                 cpu_relax();
 }