X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/641e19bb651ea4b4bb998c68252fe09227f41e8e..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/broadcom-diag/src/gpio.h diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h index 22f20c99b..6b1b2ada4 100644 --- a/package/broadcom-diag/src/gpio.h +++ b/package/broadcom-diag/src/gpio.h @@ -3,54 +3,43 @@ #include #ifndef BCMDRIVER -#include -#include -#include +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) +#include +#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); } static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset, @@ -66,11 +55,16 @@ 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) { if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler))