From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 17 Sep 2014 21:25:36 +0000 (+0000)
Subject: kernel: fix backport of bcma init patch
X-Git-Tag: reboot~5912
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da74f722e1fa3651cb3c1d41c3f5c7c8f7e9b05f;p=oweals%2Fopenwrt.git

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
---

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);
+