diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-03-30 19:08:37 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-03-30 19:08:37 +0000 |
| commit | bdde12b13a1ccba68a050868f1607b0a99168bb5 (patch) | |
| tree | 2ac06a27ec7ff53c0f9828f9945d0161c82a55eb /target/linux/generic/patches-3.12 | |
| parent | c286feac80470ed04267e644de4e2df08a9a9d40 (diff) | |
| download | upstream-bdde12b13a1ccba68a050868f1607b0a99168bb5.tar.gz upstream-bdde12b13a1ccba68a050868f1607b0a99168bb5.tar.bz2 upstream-bdde12b13a1ccba68a050868f1607b0a99168bb5.zip | |
kernel: backport BCM5357 fix for GPIOs
This backports: bcma: gpio: register 32 GPIOs on BCM5357
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 40347
Diffstat (limited to 'target/linux/generic/patches-3.12')
| -rw-r--r-- | target/linux/generic/patches-3.12/025-bcma_backport.patch | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.12/025-bcma_backport.patch b/target/linux/generic/patches-3.12/025-bcma_backport.patch index 3e86f69f42..1b88dfdda0 100644 --- a/target/linux/generic/patches-3.12/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.12/025-bcma_backport.patch @@ -198,17 +198,26 @@ chip->label = "bcma_gpio"; chip->owner = THIS_MODULE; -@@ -95,7 +215,9 @@ int bcma_gpio_init(struct bcma_drv_cc *c +@@ -95,8 +215,17 @@ int bcma_gpio_init(struct bcma_drv_cc *c chip->set = bcma_gpio_set_value; chip->direction_input = bcma_gpio_direction_input; chip->direction_output = bcma_gpio_direction_output; +#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC) chip->to_irq = bcma_gpio_to_irq; +- chip->ngpio = 16; +#endif - chip->ngpio = 16; ++ switch (cc->core->bus->chipinfo.id) { ++ case BCMA_CHIP_ID_BCM5357: ++ chip->ngpio = 32; ++ break; ++ default: ++ chip->ngpio = 16; ++ } ++ /* There is just one SoC in one device and its GPIO addresses should be * deterministic to address them more easily. The other buses could get -@@ -105,10 +227,21 @@ int bcma_gpio_init(struct bcma_drv_cc *c + * a random base number. */ +@@ -105,10 +234,21 @@ int bcma_gpio_init(struct bcma_drv_cc *c else chip->base = -1; |