Move curl from packages to trunk, opkg depends on it

[openwrt.git] / package / switch / src / gpio-bcm947xx.h

diff --git a/package/switch/src/gpio-bcm947xx.h b/package/switch/src/gpio-bcm947xx.h
index 384ea3e..9135f91 100644 (file)
--- a/package/switch/src/gpio-bcm947xx.h
+++ b/package/switch/src/gpio-bcm947xx.h
@@ -3,54 +3,43 @@
 #include <linux/interrupt.h>
 
 #ifndef BCMDRIVER
-#include <linux/ssb/ssb.h>
-#include <linux/ssb/ssb_driver_chipcommon.h>
-#include <linux/ssb/ssb_driver_extif.h>
+#include <linux/ssb/ssb_embedded.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+#define ssb ssb_bcm47xx
+#endif
 
 extern struct ssb_bus ssb;
 
-#define gpio_op(op, param...) \
-       do { \
-               if (ssb.chipco.dev) \
-                       return ssb_chipco_gpio_##op(&ssb.chipco, param); \
-               else if (ssb.extif.dev) \
-                       return ssb_extif_gpio_##op(&ssb.extif, param); \
-               else \
-                       return 0; \
-       } while (0);
-               
 
 static inline u32 gpio_in(void)
 {
-       gpio_op(in, ~0);
+       return ssb_gpio_in(&ssb, ~0);
 }
 
 static inline u32 gpio_out(u32 mask, u32 value)
 {
-       gpio_op(out, mask, value);
+       return ssb_gpio_out(&ssb, mask, value);
 }
 
 static inline u32 gpio_outen(u32 mask, u32 value)
 {
-       gpio_op(outen, mask, value);
+       return ssb_gpio_outen(&ssb, mask, value);
 }
 
 static inline u32 gpio_control(u32 mask, u32 value)
 {
-       if (ssb.chipco.dev)
-               return ssb_chipco_gpio_control(&ssb.chipco, mask, value);
-       else
-               return 0;
+       return ssb_gpio_control(&ssb, mask, value);
 }
 
 static inline u32 gpio_intmask(u32 mask, u32 value)
 {
-       gpio_op(intmask, mask, value);
+       return ssb_gpio_intmask(&ssb, mask, value);
 }
 
 static inline u32 gpio_intpolarity(u32 mask, u32 value)
 {
-       gpio_op(polarity, mask, value);
+       return ssb_gpio_polarity(&ssb, mask, value);
 }
 
 #else