diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-22 21:40:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-22 21:40:41 +0000 |
commit | 0d3690a202894a87e4cb1a1ba7542917f0b29a8d (patch) | |
tree | 8ca27050505b3eca1431c1e488d2661c39ab9fe7 /target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch | |
parent | 1e710a93ebe1110e356af2bb1b71c78b51c10607 (diff) | |
download | upstream-0d3690a202894a87e4cb1a1ba7542917f0b29a8d.tar.gz upstream-0d3690a202894a87e4cb1a1ba7542917f0b29a8d.tar.bz2 upstream-0d3690a202894a87e4cb1a1ba7542917f0b29a8d.zip |
kernel: update bcma and ssb to version master-2014-07-22
This is a backport of bcma and ssb from wireless-tesing/master tag
master-2014-07-22.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 41804
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 9fdf66af08..dd4d284aaa 100644 --- 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 @@ -112,8 +112,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + case BCMA_CORE_CHIPCOMMON_B: case BCMA_CORE_PCI: case BCMA_CORE_PCIE: - case BCMA_CORE_MIPS_74K: -@@ -300,6 +301,13 @@ int bcma_bus_register(struct bcma_bus *b + case BCMA_CORE_PCIE2: +@@ -301,6 +302,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) { -@@ -347,6 +355,8 @@ void bcma_bus_unregister(struct bcma_bus +@@ -355,6 +363,8 @@ void bcma_bus_unregister(struct bcma_bus else if (err) bcma_err(bus, "Can not unregister GPIO driver: %i\n", err); @@ -148,14 +148,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> default: --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -334,6 +334,7 @@ struct bcma_bus { +@@ -337,6 +337,7 @@ struct bcma_bus { u8 num; struct bcma_drv_cc drv_cc; + struct bcma_drv_cc_b drv_cc_b; struct bcma_drv_pci drv_pci[2]; + struct bcma_drv_pcie2 drv_pcie2; struct bcma_drv_mips drv_mips; - struct bcma_drv_gmac_cmn drv_gmac_cmn; --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -644,6 +644,12 @@ struct bcma_drv_cc { |