2 files changed, 52 insertions, 17 deletions

diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
index d008f47a28bd..7cf481bb1a05 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
@@ -19,7 +19,17 @@
 #ifndef __ASM_BCM47XX_H
 #define __ASM_BCM47XX_H
 
-/* SSB bus */
-extern struct ssb_bus ssb_bcm47xx;
+#include <linux/ssb/ssb.h>
+
+enum bcm47xx_bus_type {
+        BCM47XX_BUS_TYPE_SSB,
+};
+
+union bcm47xx_bus {
+        struct ssb_bus ssb;
+};
+
+extern union bcm47xx_bus bcm47xx_bus;
+extern enum bcm47xx_bus_type bcm47xx_bus_type;
 
 #endif /* __ASM_BCM47XX_H */
diff --git a/arch/mips/include/asm/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h
index 98504142124e..6b78827dd140 100644
--- a/arch/mips/include/asm/mach-bcm47xx/gpio.h
+++ b/arch/mips/include/asm/mach-bcm47xx/gpio.h
@@ -21,41 +21,66 @@ extern int gpio_to_irq(unsigned gpio);
 
 static inline int gpio_get_value(unsigned gpio)
 {
-        return ssb_gpio_in(&ssb_bcm47xx, 1 << gpio);
+        switch (bcm47xx_bus_type) {
+        case BCM47XX_BUS_TYPE_SSB:
+                return ssb_gpio_in(&bcm47xx_bus.ssb, 1 << gpio);
+        }
+        return -EINVAL;
 }
 
 static inline void gpio_set_value(unsigned gpio, int value)
 {
-        ssb_gpio_out(&ssb_bcm47xx, 1 << gpio, value ? 1 << gpio : 0);
+        switch (bcm47xx_bus_type) {
+        case BCM47XX_BUS_TYPE_SSB:
+                ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio,
+                             value ? 1 << gpio : 0);
+        }
 }
 
 static inline int gpio_direction_input(unsigned gpio)
 {
-        ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0);
-        return 0;
+        switch (bcm47xx_bus_type) {
+        case BCM47XX_BUS_TYPE_SSB:
+                ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 0);
+                return 0;
+        }
+        return -EINVAL;
 }
 
 static inline int gpio_direction_output(unsigned gpio, int value)
 {
-        /* first set the gpio out value */
-        ssb_gpio_out(&ssb_bcm47xx, 1 << gpio, value ? 1 << gpio : 0);
-        /* then set the gpio mode */
-        ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio);
-        return 0;
+        switch (bcm47xx_bus_type) {
+        case BCM47XX_BUS_TYPE_SSB:
+                /* first set the gpio out value */
+                ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio,
+                             value ? 1 << gpio : 0);
+                /* then set the gpio mode */
+                ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 1 << gpio);
+                return 0;
+        }
+        return -EINVAL;
 }
 
 static inline int gpio_intmask(unsigned gpio, int value)
 {
-        ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio,
-                         value ? 1 << gpio : 0);
-        return 0;
+        switch (bcm47xx_bus_type) {
+        case BCM47XX_BUS_TYPE_SSB:
+                ssb_gpio_intmask(&bcm47xx_bus.ssb, 1 << gpio,
+                                 value ? 1 << gpio : 0);
+                return 0;
+        }
+        return -EINVAL;
 }
 
 static inline int gpio_polarity(unsigned gpio, int value)
 {
-        ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,
-                          value ? 1 << gpio : 0);
-        return 0;
+        switch (bcm47xx_bus_type) {
+        case BCM47XX_BUS_TYPE_SSB:
+                ssb_gpio_polarity(&bcm47xx_bus.ssb, 1 << gpio,
+                                  value ? 1 << gpio : 0);
+                return 0;
+        }
+        return -EINVAL;
 }