MIPS: BCM47xx: Use the new SSB GPIO API

This patch simplifies the BCM47xx GPIO code by using the new SSB GPIO
API, which does a lot things that were implemented directly in the
BCM47xx code.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cd5fbf6f07848c3c9778aae1e8be265a92f426c4..b905744d79153be3d3170e9f81ce4e0805974d71 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -52,6 +52,7 @@ config BCM47XX
        select SSB
        select SSB_DRIVER_MIPS
        select SSB_DRIVER_EXTIF
+       select SSB_EMBEDDED
        select SSB_PCICORE_HOSTMODE if PCI
        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK

diff --git a/arch/mips/bcm47xx/gpio.c b/arch/mips/bcm47xx/gpio.c
index f5a53acf995a67eb7b8af311e755efc0d2db2922..9b798800258c3db159cb8ea78718d47feefe2836 100644 (file)
--- 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 8d36f186890eaf5e4271c31ea967c0efbe18608e..2f580fa160c9f2ca33de248385ce743c8cf58365 100644 (file)
--- 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();
 }

diff --git a/arch/mips/include/asm/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h
index cfc8f4d618ce517e137b7c0f57c0a65ce068bc75..d8ff4cd89ab50731d68f360f04bf5b08d9b779be 100644 (file)
--- a/arch/mips/include/asm/mach-bcm47xx/gpio.h
+++ b/arch/mips/include/asm/mach-bcm47xx/gpio.h
@@ -9,47 +9,46 @@
 #ifndef __BCM47XX_GPIO_H
 #define __BCM47XX_GPIO_H
 
+#include <linux/ssb/ssb_embedded.h>
+#include <asm/mach-bcm47xx/bcm47xx.h>
+
 #define BCM47XX_EXTIF_GPIO_LINES       5
 #define BCM47XX_CHIPCO_GPIO_LINES      16
 
-extern int bcm47xx_gpio_to_irq(unsigned gpio);
-extern int bcm47xx_gpio_get_value(unsigned gpio);
-extern void bcm47xx_gpio_set_value(unsigned gpio, int value);
-extern int bcm47xx_gpio_direction_input(unsigned gpio);
-extern int bcm47xx_gpio_direction_output(unsigned gpio, int value);
-
-static inline int gpio_request(unsigned gpio, const char *label)
-{
-       return 0;
-}
+extern int gpio_request(unsigned gpio, const char *label);
+extern void gpio_free(unsigned gpio);
+extern int gpio_to_irq(unsigned gpio);
 
-static inline void gpio_free(unsigned gpio)
+static inline int gpio_get_value(unsigned gpio)
 {
+       return ssb_gpio_in(&ssb_bcm47xx, 1 << gpio);
 }
 
-static inline int gpio_to_irq(unsigned gpio)
+static inline void gpio_set_value(unsigned gpio, int value)
 {
-       return bcm47xx_gpio_to_irq(gpio);
+       ssb_gpio_out(&ssb_bcm47xx, 1 << gpio, value ? 1 << gpio : 0);
 }
 
-static inline int gpio_get_value(unsigned gpio)
+static inline int gpio_direction_input(unsigned gpio)
 {
-       return bcm47xx_gpio_get_value(gpio);
+       return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0);
 }
 
-static inline void gpio_set_value(unsigned gpio, int value)
+static inline int gpio_direction_output(unsigned gpio, int value)
 {
-       bcm47xx_gpio_set_value(gpio, value);
+       return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio);
 }
 
-static inline int gpio_direction_input(unsigned gpio)
+static int gpio_intmask(unsigned gpio, int value)
 {
-       return bcm47xx_gpio_direction_input(gpio);
+       return ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio,
+                               value ? 1 << gpio : 0);
 }
 
-static inline int gpio_direction_output(unsigned gpio, int value)
+static int gpio_polarity(unsigned gpio, int value)
 {
-       return bcm47xx_gpio_direction_output(gpio, value);
+       return ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,
+                                value ? 1 << gpio : 0);
 }