Author: rmilecki Date: 2014-09-17 23:25:36 +0200 (Wed, 17 Sep 2014) New Revision: 42603
Modified: trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch Log: 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?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch =================================================================== --- trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch 2014-09-17 15:04:30 UTC (rev 42602) +++ trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch 2014-09-17 21:25:36 UTC (rev 42603) @@ -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); Modified: trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch =================================================================== --- trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch 2014-09-17 15:04:30 UTC (rev 42602) +++ trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch 2014-09-17 21:25:36 UTC (rev 42603) @@ -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); + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
