diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-08-05 12:40:05 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-08-05 12:40:05 +0000 |
| commit | 3b5a66a3de59a39e1086a5f2335bdc1f9735eb41 (patch) | |
| tree | c7f897b353876662d21fca441d99062cb306c056 /target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch | |
| parent | bdf997adb2e12e4a7770f7ab9b85c051fdfc6dd7 (diff) | |
| download | master-187ad058-3b5a66a3de59a39e1086a5f2335bdc1f9735eb41.tar.gz master-187ad058-3b5a66a3de59a39e1086a5f2335bdc1f9735eb41.tar.bz2 master-187ad058-3b5a66a3de59a39e1086a5f2335bdc1f9735eb41.zip | |
brcm47xx: update gpio patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33001 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch | 16 |
1 files changed, 7 insertions, 9 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_ */ |