Changeset 42603


Ignore:
Timestamp:
2014-09-17T23:25:36+02:00 (3 years ago)
Author:
rmilecki
Message:

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

Location:
trunk/target/linux/generic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch

    r42537 r42603  
    22672267+               iounmap(ccb->mii); 
    22682268+} 
     2269--- a/include/linux/bcma/bcma_soc.h 
     2270+++ b/include/linux/bcma/bcma_soc.h 
     2271@@ -10,6 +10,7 @@ struct bcma_soc { 
     2272 }; 
     2273  
     2274 int __init bcma_host_soc_register(struct bcma_soc *soc); 
     2275+int __init bcma_host_soc_init(struct bcma_soc *soc); 
     2276  
     2277 int bcma_bus_register(struct bcma_bus *bus); 
     2278  
     2279--- a/arch/mips/bcm47xx/setup.c 
     2280+++ b/arch/mips/bcm47xx/setup.c 
     2281@@ -194,6 +194,10 @@ static void __init bcm47xx_register_bcma 
     2282  
     2283        err = bcma_host_soc_register(&bcm47xx_bus.bcma); 
     2284        if (err) 
     2285+               panic("Failed to register BCMA bus (err %d)", err); 
     2286+ 
     2287+       err = bcma_host_soc_init(&bcm47xx_bus.bcma); 
     2288+       if (err) 
     2289                panic("Failed to initialize BCMA bus (err %d)", err); 
     2290  
     2291        bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 
  • trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch

    r42537 r42603  
    10971097+ 
    10981098 #endif /* LINUX_BCMA_DRIVER_CC_H_ */ 
     1099--- a/arch/mips/bcm47xx/setup.c 
     1100+++ b/arch/mips/bcm47xx/setup.c 
     1101@@ -202,6 +202,10 @@ static void __init bcm47xx_register_bcma 
     1102  
     1103        err = bcma_host_soc_register(&bcm47xx_bus.bcma); 
     1104        if (err) 
     1105+               panic("Failed to register BCMA bus (err %d)", err); 
     1106+ 
     1107+       err = bcma_host_soc_init(&bcm47xx_bus.bcma); 
     1108+       if (err) 
     1109                panic("Failed to initialize BCMA bus (err %d)", err); 
     1110  
     1111        bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); 
     1112--- a/include/linux/bcma/bcma_soc.h 
     1113+++ b/include/linux/bcma/bcma_soc.h 
     1114@@ -10,6 +10,7 @@ struct bcma_soc { 
     1115 }; 
     1116  
     1117 int __init bcma_host_soc_register(struct bcma_soc *soc); 
     1118+int __init bcma_host_soc_init(struct bcma_soc *soc); 
     1119  
     1120 int bcma_bus_register(struct bcma_bus *bus); 
     1121  
Note: See TracChangeset for help on using the changeset viewer.