aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-05-09 17:38:48 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-05-09 17:38:48 +0000
commit3a6cdac37ca224b3345282f8ddfc820dd76543e2 (patch)
tree2fff91721268b3d7b43d6821b451c26e552475e2 /target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
parent29f8f90de46236f498e0c7dc799bb5a30055d0a4 (diff)
downloadupstream-3a6cdac37ca224b3345282f8ddfc820dd76543e2.tar.gz
upstream-3a6cdac37ca224b3345282f8ddfc820dd76543e2.tar.bz2
upstream-3a6cdac37ca224b3345282f8ddfc820dd76543e2.zip
kernel: backport first bcma patches from 4.2
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45652
Diffstat (limited to 'target/linux/generic/patches-3.18/028-bcma-from-4.2.patch')
-rw-r--r--target/linux/generic/patches-3.18/028-bcma-from-4.2.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch b/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
new file mode 100644
index 0000000000..1a9f472a4a
--- /dev/null
+++ b/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
@@ -0,0 +1,37 @@
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -226,6 +226,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ chip->of_node = cc->core->dev.of_node;
+ #endif
+ switch (bus->chipinfo.id) {
++ case BCMA_CHIP_ID_BCM4707:
+ case BCMA_CHIP_ID_BCM5357:
+ case BCMA_CHIP_ID_BCM53572:
+ chip->ngpio = 32;
+@@ -235,16 +236,17 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ }
+
+ /*
+- * On MIPS we register GPIO devices (LEDs, buttons) using absolute GPIO
+- * pin numbers. We don't have Device Tree there and we can't really use
+- * relative (per chip) numbers.
+- * So let's use predictable base for BCM47XX and "random" for all other.
++ * Register SoC GPIO devices with absolute GPIO pin base.
++ * On MIPS, we don't have Device Tree and we can't use relative (per chip)
++ * GPIO numbers.
++ * On some ARM devices, user space may want to access some system GPIO
++ * pins directly, which is easier to do with a predictable GPIO base.
+ */
+-#if IS_BUILTIN(CONFIG_BCM47XX)
+- chip->base = bus->num * BCMA_GPIO_MAX_PINS;
+-#else
+- chip->base = -1;
+-#endif
++ if (IS_BUILTIN(CONFIG_BCM47XX) ||
++ cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
++ chip->base = bus->num * BCMA_GPIO_MAX_PINS;
++ else
++ chip->base = -1;
+
+ err = bcma_gpio_irq_domain_init(cc);
+ if (err)