diff options
| author | Peter Denison <openwrt@marshadder.org> | 2007-06-30 23:10:22 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2007-06-30 23:10:22 +0000 |
| commit | c63f9b3097b8463424e0a68af43bb3bd2e6b7d35 (patch) | |
| tree | 07ed23f55a64da2440f7d31736931f52350de007 /target/linux/brcm47xx-2.6 | |
| parent | b24263a9b6d028c592c3b2281ce7b37b1c50b01b (diff) | |
| download | mtk-20170518-c63f9b3097b8463424e0a68af43bb3bd2e6b7d35.zip mtk-20170518-c63f9b3097b8463424e0a68af43bb3bd2e6b7d35.tar.gz mtk-20170518-c63f9b3097b8463424e0a68af43bb3bd2e6b7d35.tar.bz2 | |
Bring mach-bcm947xx/gpio.h into line with new SSB code, as per #1640
SVN-Revision: 7814
Diffstat (limited to 'target/linux/brcm47xx-2.6')
| -rw-r--r-- | target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h b/target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h index 2999a25..9a67e8e 100644 --- a/target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h +++ b/target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h @@ -18,10 +18,10 @@ static inline void gpio_free(unsigned gpio) static inline int gpio_direction_input(unsigned gpio) { - if (ssb.chipco->dev) - ssb_chipco_gpioouten(&ssb.chipco, 1 << gpio, 0); - else if (ssb.extif->dev) - ssb_extif_gpioouten(&ssb.extif, 1 << gpio, 0); + if (ssb.chipco.dev) + ssb_chipco_gpio_outen(&ssb.chipco, 1 << gpio, 0); + else if (ssb.extif.dev) + ssb_extif_gpio_outen(&ssb.extif, 1 << gpio, 0); else return -EINVAL; return 0; @@ -29,10 +29,10 @@ static inline int gpio_direction_input(unsigned gpio) static inline int gpio_direction_output(unsigned gpio) { - if (ssb.chipco->dev) - ssb_chipco_gpioouten(&ssb.chipco, 1 << gpio, 1 << gpio); - else if (ssb.extif->dev) - ssb_extif_gpioouten(&ssb.extif, 1 << gpio, 1 << gpio); + if (ssb.chipco.dev) + ssb_chipco_gpio_outen(&ssb.chipco, 1 << gpio, 1 << gpio); + else if (ssb.extif.dev) + ssb_extif_gpio_outen(&ssb.extif, 1 << gpio, 1 << gpio); else return -EINVAL; @@ -44,9 +44,9 @@ static inline int gpio_to_irq(unsigned gpio) { struct ssb_device *dev; - dev = ssb.chipco->dev; + dev = ssb.chipco.dev; if (!dev) - dev = ssb.extif->dev; + dev = ssb.extif.dev; if (!dev) return -EINVAL; @@ -61,20 +61,20 @@ static inline int irq_to_gpio(unsigned gpio) static inline int gpio_get_value(unsigned gpio) { - if (ssb.chipco->dev) - return ssb_chipco_gpioin(&ssb.chipco, 1 << gpio) ? 1 : 0; - else if (ssb.extif->dev) - return ssb_extif_gpioin(&ssb.extif, 1 << gpio) ? 1 : 0; + if (ssb.chipco.dev) + return ssb_chipco_gpio_in(&ssb.chipco, 1 << gpio) ? 1 : 0; + else if (ssb.extif.dev) + return ssb_extif_gpio_in(&ssb.extif, 1 << gpio) ? 1 : 0; else return 0; } static inline int gpio_set_value(unsigned gpio, int value) { - if (ssb.chipco->dev) - ssb_chipco_gpioout(&ssb.chipco, 1 << gpio, (value ? 1 << gpio : 0)); - else if (ssb.extif->dev) - ssb_extif_gpioout(&ssb.extif, 1 << gpio, (value ? 1 << gpio : 0)); + if (ssb.chipco.dev) + ssb_chipco_gpio_out(&ssb.chipco, 1 << gpio, (value ? 1 << gpio : 0)); + else if (ssb.extif.dev) + ssb_extif_gpio_out(&ssb.extif, 1 << gpio, (value ? 1 << gpio : 0)); return 0; } |