kernel: add bcma patches sent upstream but not pushed yet

[librecmc/librecmc.git] / target / linux / bcm53xx / patches-3.14 / 142-bcma-add-support-for-chipcommon-B-core.patch

diff --git a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
index c744e3892d60d1109b5722059f2986290c384a1c..59b94c1170f07f15601dbbbc2d999b738d481c0c 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
+++ b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
@@ -105,7 +105,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +}
 --- a/drivers/bcma/main.c
 +++ b/drivers/bcma/main.c
-@@ -164,6 +164,7 @@ static int bcma_register_cores(struct bc
+@@ -213,6 +213,7 @@ static int bcma_register_devices(struct
                switch (core->id.id) {
                case BCMA_CORE_4706_CHIPCOMMON:
                case BCMA_CORE_CHIPCOMMON:
@@ -113,7 +113,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                case BCMA_CORE_PCI:
                case BCMA_CORE_PCIE:
                case BCMA_CORE_PCIE2:
-@@ -301,6 +302,13 @@ int bcma_bus_register(struct bcma_bus *b
+@@ -327,6 +328,13 @@ int bcma_bus_register(struct bcma_bus *b
                bcma_core_chipcommon_init(&bus->drv_cc);
        }
  
@@ -127,7 +127,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        /* Init MIPS core */
        core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
        if (core) {
-@@ -355,6 +363,8 @@ void bcma_bus_unregister(struct bcma_bus
+@@ -381,6 +389,8 @@ void bcma_bus_unregister(struct bcma_bus
        else if (err)
                bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
  
@@ -148,7 +148,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                default:
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -338,6 +338,7 @@ struct bcma_bus {
+@@ -337,6 +337,7 @@ struct bcma_bus {
        u8 num;
  
        struct bcma_drv_cc drv_cc;