aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-08 16:54:14 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-03-08 16:55:21 +0100
commit154b3a68638297b2ea53deb9bb98f9c5dfe8900b (patch)
tree525c7814b938184bc87be3b9634fa8f79927d878 /target
parent92b5b360fe39a4e446742ab3de9d0b2f91991d46 (diff)
downloadupstream-154b3a68638297b2ea53deb9bb98f9c5dfe8900b.tar.gz
upstream-154b3a68638297b2ea53deb9bb98f9c5dfe8900b.tar.bz2
upstream-154b3a68638297b2ea53deb9bb98f9c5dfe8900b.zip
kernel: backport first bcma 4.12 patch for GPIO and of_node
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-4.4/026-bcma-from-4.12.patch12
-rw-r--r--target/linux/generic/patches-4.9/072-bcma-from-4.12.patch12
2 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/026-bcma-from-4.12.patch b/target/linux/generic/patches-4.4/026-bcma-from-4.12.patch
new file mode 100644
index 0000000000..ab8a212940
--- /dev/null
+++ b/target/linux/generic/patches-4.4/026-bcma-from-4.12.patch
@@ -0,0 +1,12 @@
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -190,8 +190,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ chip->owner = THIS_MODULE;
+ chip->dev = bcma_bus_get_host_dev(bus);
+ #if IS_BUILTIN(CONFIG_OF)
+- if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
+- chip->of_node = cc->core->dev.of_node;
++ chip->of_node = cc->core->dev.of_node;
+ #endif
+ switch (bus->chipinfo.id) {
+ case BCMA_CHIP_ID_BCM4707:
diff --git a/target/linux/generic/patches-4.9/072-bcma-from-4.12.patch b/target/linux/generic/patches-4.9/072-bcma-from-4.12.patch
new file mode 100644
index 0000000000..1c3efea172
--- /dev/null
+++ b/target/linux/generic/patches-4.9/072-bcma-from-4.12.patch
@@ -0,0 +1,12 @@
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -185,8 +185,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ chip->owner = THIS_MODULE;
+ chip->parent = bcma_bus_get_host_dev(bus);
+ #if IS_BUILTIN(CONFIG_OF)
+- if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
+- chip->of_node = cc->core->dev.of_node;
++ chip->of_node = cc->core->dev.of_node;
+ #endif
+ switch (bus->chipinfo.id) {
+ case BCMA_CHIP_ID_BCM4707: