kernel: add bcma patches sent upstream but not pushed yet

[lede-git/.git] / target / linux / bcm53xx / patches-3.14 / 120-bcma-register-bcma-as-device-tree-driver.patch

diff --git a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
index 317fbdc90062bf3fb1f2e87b6c0b9d1916b45a13..9027f48678e339fb0a14c9bacca4a5ad8f0d8b19 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
+++ b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
@@ -76,15 +76,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <linux/bcma/bcma.h>
  #include <linux/bcma/bcma_soc.h>
  
-@@ -173,6 +176,7 @@ int __init bcma_host_soc_register(struct
+@@ -176,6 +179,7 @@ int __init bcma_host_soc_register(struct
        /* Host specific */
        bus->hosttype = BCMA_HOSTTYPE_SOC;
        bus->ops = &bcma_host_soc_ops;
 +      bus->host_pdev = NULL;
  
-       /* Register */
-       err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
-@@ -181,3 +185,69 @@ int __init bcma_host_soc_register(struct
+       /* Initialize struct, detect chip */
+       bcma_init_bus(bus);
+@@ -195,3 +199,72 @@ int __init bcma_host_soc_init(struct bcm
  
        return err;
  }
@@ -112,6 +112,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      bus->ops = &bcma_host_soc_ops;
 +      bus->host_pdev = pdev;
 +
++      /* Initialize struct, detect chip */
++      bcma_init_bus(bus);
++
 +      /* Register */
 +      err = bcma_bus_register(bus);
 +      if (err)