upgrade opkg to r215 from the googlecode svn

[openwrt.git] / package / broadcom-diag / src / gpio.h

diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index 982cadd..cd48637 100644 (file)
--- a/package/broadcom-diag/src/gpio.h
+++ b/package/broadcom-diag/src/gpio.h
@@ -3,72 +3,78 @@
 #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)
+#include <linux/gpio.h>
+#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)
+static inline u32 gpio_setintmask(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);
 }
 
-static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *, struct pt_regs *))
+static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset,
+                                      u32 mask, u32 value)
+{
+       value &= mask;
+       value |= ssb_read32(dev, offset) & ~mask;
+       ssb_write32(dev, offset, value);
+       return value;
+}
+
+static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *))
 {
        int irq;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+       irq = gpio_to_irq(0);
+       if (irq == -EINVAL) return;
+#else
        if (ssb.chipco.dev)
                irq = ssb_mips_irq(ssb.chipco.dev) + 2;
        else if (ssb.extif.dev)
                irq = ssb_mips_irq(ssb.extif.dev) + 2;
        else return;
+#endif
        
-       if (enabled)
-               request_irq(irq, handler, SA_SHIRQ | SA_SAMPLE_RANDOM, "gpio", handler);
-       else
+       if (enabled) {
+               if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler))
+                       return;
+       } else {
                free_irq(irq, handler);
+       }
 
-       gpio_intmask(1, (enabled ? 1 : 0));
+       if (ssb.chipco.dev)
+               __ssb_write32_masked(ssb.chipco.dev, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0));
 }
 
 #else
@@ -97,7 +103,7 @@ extern spinlock_t sbh_lock;
 #define gpio_out(mask, value)  sb_gpioout(sbh, mask, ((value) & (mask)), GPIO_DRV_PRIORITY)
 #define gpio_outen(mask, value)        sb_gpioouten(sbh, mask, value, GPIO_DRV_PRIORITY)
 #define gpio_control(mask, value)      sb_gpiocontrol(sbh, mask, value, GPIO_DRV_PRIORITY)
-#define gpio_intmask(mask, value)      sb_gpiointmask(sbh, mask, value, GPIO_DRV_PRIORITY)
+#define gpio_setintmask(mask, value)   sb_gpiointmask(sbh, mask, value, GPIO_DRV_PRIORITY)
 #define gpio_intpolarity(mask, value)  sb_gpiointpolarity(sbh, mask, value, GPIO_DRV_PRIORITY)
 
 static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *, struct pt_regs *))