diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-05 12:40:05 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-05 12:40:05 +0000 |
| commit | 302fdbb0b88fbd52eb3e3f51fb54704e7c942a6e (patch) | |
| tree | c7f897b353876662d21fca441d99062cb306c056 /target | |
| parent | b8881f1e23891e7a8aedd7a25e2e17dff8afa7b1 (diff) | |
brcm47xx: update gpio patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33001 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch | 16 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/502-bcm47xx-rewrite-gpio-handling.patch | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch b/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch index 1fd2cffffb..ad8b46098d 100644 --- a/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch +++ b/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch @@ -24,7 +24,7 @@ obj-$(CONFIG_BCMA) += bcma.o --- /dev/null +++ b/drivers/bcma/driver_gpio.c -@@ -0,0 +1,96 @@ +@@ -0,0 +1,90 @@ +/* + * Broadcom specific AMBA + * GPIO driver for SoCs @@ -115,12 +115,6 @@ + return res; +} +EXPORT_SYMBOL(bcma_gpio_polarity); -+ -+int bcma_gpio_count(struct bcma_bus *bus) -+{ -+ return BCMA_GPIO_CC_LINES; -+} -+EXPORT_SYMBOL(bcma_gpio_count); --- a/drivers/bcma/scan.c +++ b/drivers/bcma/scan.c @@ -422,6 +422,10 @@ void bcma_init_bus(struct bcma_bus *bus) @@ -150,7 +144,7 @@ struct ssb_sprom sprom; --- /dev/null +++ b/include/linux/bcma/bcma_driver_gpio.h -@@ -0,0 +1,17 @@ +@@ -0,0 +1,21 @@ +#ifndef LINUX_BCMA_DRIVER_GPIO_H_ +#define LINUX_BCMA_DRIVER_GPIO_H_ + @@ -165,6 +159,10 @@ +u32 bcma_gpio_control(struct bcma_bus *bus, u32 mask, u32 value); +u32 bcma_gpio_intmask(struct bcma_bus *bus, u32 mask, u32 value); +u32 bcma_gpio_polarity(struct bcma_bus *bus, u32 mask, u32 value); -+int bcma_gpio_count(struct bcma_bus *bus); ++ ++static inline int bcma_gpio_count(struct bcma_bus *bus) ++{ ++ return BCMA_GPIO_CC_LINES; ++} + +#endif /* LINUX_BCMA_DRIVER_GPIO_H_ */ diff --git a/target/linux/brcm47xx/patches-3.3/502-bcm47xx-rewrite-gpio-handling.patch b/target/linux/brcm47xx/patches-3.3/502-bcm47xx-rewrite-gpio-handling.patch index 4aa2e46d77..25262bd68d 100644 --- a/target/linux/brcm47xx/patches-3.3/502-bcm47xx-rewrite-gpio-handling.patch +++ b/target/linux/brcm47xx/patches-3.3/502-bcm47xx-rewrite-gpio-handling.patch @@ -304,7 +304,7 @@ + if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET), gpio_interrupt, IRQF_SHARED, - "WGT634U GPIO", &bcm47xx_bus.ssb.chipco)) { + "WGT634U GPIO", ccore)) { --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h @@ -56,4 +56,6 @@ void bcm47xx_fill_bcma_boardinfo(struct |