diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-09-17 21:25:36 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-09-17 21:25:36 +0000 |
| commit | 3421f4b3b664bdaf838f7140c451134bac6b1bb6 (patch) | |
| tree | 09ec258c80739b1f7eb78c34b4c06b3dd318436b /target/linux/generic/patches-3.14/025-bcma_backport.patch | |
| parent | 73985d24f28c70d6a1534dde888f8ae9cbd2e077 (diff) | |
| download | master-187ad058-3421f4b3b664bdaf838f7140c451134bac6b1bb6.tar.gz master-187ad058-3421f4b3b664bdaf838f7140c451134bac6b1bb6.tar.bz2 master-187ad058-3421f4b3b664bdaf838f7140c451134bac6b1bb6.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42603 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/025-bcma_backport.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/025-bcma_backport.patch | 23 |
1 files changed, 23 insertions, 0 deletions
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); + |