aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-09-17 21:25:36 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-09-17 21:25:36 +0000
commitda74f722e1fa3651cb3c1d41c3f5c7c8f7e9b05f (patch)
tree5602f9f538b267bf7fc8629671839b131e039c22 /target/linux/generic
parent5b3f0d98dfc3e3f72d7e7a93d2c9aa7cf90c1afd (diff)
downloadupstream-da74f722e1fa3651cb3c1d41c3f5c7c8f7e9b05f.tar.gz
upstream-da74f722e1fa3651cb3c1d41c3f5c7c8f7e9b05f.tar.bz2
upstream-da74f722e1fa3651cb3c1d41c3f5c7c8f7e9b05f.zip
kernel: fix backport of bcma init patch
Upstream bcma patch: bcma: use separated function to initialize bus on SoC was backported incompletely. I missed arch code change. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 42603
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.10/025-bcma_backport.patch23
-rw-r--r--target/linux/generic/patches-3.14/025-bcma_backport.patch23
2 files changed, 46 insertions, 0 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 731dea308b..922b140ea6 100644
--- a/target/linux/generic/patches-3.10/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.10/025-bcma_backport.patch
@@ -2266,3 +2266,26 @@
+ if (ccb->mii)
+ iounmap(ccb->mii);
+}
+--- a/include/linux/bcma/bcma_soc.h
++++ b/include/linux/bcma/bcma_soc.h
+@@ -10,6 +10,7 @@ struct bcma_soc {
+ };
+
+ int __init bcma_host_soc_register(struct bcma_soc *soc);
++int __init bcma_host_soc_init(struct bcma_soc *soc);
+
+ int bcma_bus_register(struct bcma_bus *bus);
+
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -194,6 +194,10 @@ static void __init bcm47xx_register_bcma
+
+ err = bcma_host_soc_register(&bcm47xx_bus.bcma);
+ if (err)
++ panic("Failed to register BCMA bus (err %d)", err);
++
++ err = bcma_host_soc_init(&bcm47xx_bus.bcma);
++ if (err)
+ panic("Failed to initialize BCMA bus (err %d)", err);
+
+ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
diff --git a/target/linux/generic/patches-3.14/025-bcma_backport.patch b/target/linux/generic/patches-3.14/025-bcma_backport.patch
index 380e63d607..d5ed75f909 100644
--- a/target/linux/generic/patches-3.14/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.14/025-bcma_backport.patch
@@ -1096,3 +1096,26 @@
+void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value);
+
#endif /* LINUX_BCMA_DRIVER_CC_H_ */
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -202,6 +202,10 @@ static void __init bcm47xx_register_bcma
+
+ err = bcma_host_soc_register(&bcm47xx_bus.bcma);
+ if (err)
++ panic("Failed to register BCMA bus (err %d)", err);
++
++ err = bcma_host_soc_init(&bcm47xx_bus.bcma);
++ if (err)
+ panic("Failed to initialize BCMA bus (err %d)", err);
+
+ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
+--- a/include/linux/bcma/bcma_soc.h
++++ b/include/linux/bcma/bcma_soc.h
+@@ -10,6 +10,7 @@ struct bcma_soc {
+ };
+
+ int __init bcma_host_soc_register(struct bcma_soc *soc);
++int __init bcma_host_soc_init(struct bcma_soc *soc);
+
+ int bcma_bus_register(struct bcma_bus *bus);
+