aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-03-30 19:08:37 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-03-30 19:08:37 +0000
commitbdde12b13a1ccba68a050868f1607b0a99168bb5 (patch)
tree2ac06a27ec7ff53c0f9828f9945d0161c82a55eb /target
parentc286feac80470ed04267e644de4e2df08a9a9d40 (diff)
downloadupstream-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')
-rw-r--r--target/linux/generic/patches-3.10/025-bcma_backport.patch15
-rw-r--r--target/linux/generic/patches-3.12/025-bcma_backport.patch15
-rw-r--r--target/linux/generic/patches-3.13/025-bcma_backport.patch15
-rw-r--r--target/linux/generic/patches-3.14/025-bcma_backport.patch18
4 files changed, 54 insertions, 9 deletions
diff --git a/target/linux/generic/patches-3.10/025-bcma_backport.patch b/target/linux/generic/patches-3.10/025-bcma_backport.patch
index ca911cdcc2..c3f7ffb354 100644
--- a/target/linux/generic/patches-3.10/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.10/025-bcma_backport.patch
@@ -479,17 +479,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;
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;
diff --git a/target/linux/generic/patches-3.13/025-bcma_backport.patch b/target/linux/generic/patches-3.13/025-bcma_backport.patch
index 3aad2a16db..dcb712dbbc 100644
--- a/target/linux/generic/patches-3.13/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.13/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;
diff --git a/target/linux/generic/patches-3.14/025-bcma_backport.patch b/target/linux/generic/patches-3.14/025-bcma_backport.patch
new file mode 100644
index 0000000000..b49d345473
--- /dev/null
+++ b/target/linux/generic/patches-3.14/025-bcma_backport.patch
@@ -0,0 +1,18 @@
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -218,7 +218,14 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ #if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+ chip->to_irq = bcma_gpio_to_irq;
+ #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
+ * a random base number. */