diff options
| author | Michael Büsch <mb@bu3sch.de> | 2008-02-19 13:52:57 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2008-02-19 13:52:57 +0000 |
| commit | 66dec6d8a159cfc189f7ee635c13d9b99636f1ce (patch) | |
| tree | 61044e2ffe2bb9abc8b70fb31b5df25d31f3a7b2 /package/broadcom-diag | |
| parent | 27e288859cf7247dd3dfa3bea52ec48387a0daf5 (diff) | |
| download | master-31e0f0ae-66dec6d8a159cfc189f7ee635c13d9b99636f1ce.tar.gz master-31e0f0ae-66dec6d8a159cfc189f7ee635c13d9b99636f1ce.tar.bz2 master-31e0f0ae-66dec6d8a159cfc189f7ee635c13d9b99636f1ce.zip | |
ssb: Update the GPIO API
SVN-Revision: 10495
Diffstat (limited to 'package/broadcom-diag')
| -rw-r--r-- | package/broadcom-diag/src/gpio.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h index 6d83039ee7..22f20c99b2 100644 --- a/package/broadcom-diag/src/gpio.h +++ b/package/broadcom-diag/src/gpio.h @@ -53,6 +53,15 @@ static inline u32 gpio_intpolarity(u32 mask, u32 value) gpio_op(polarity, mask, value); } +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; @@ -71,7 +80,7 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *)) } if (ssb.chipco.dev) - ssb_write32_masked(ssb.chipco.dev, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0)); + __ssb_write32_masked(ssb.chipco.dev, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0)); } #else |