aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/029-bcma-from-4.4.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-12-25 20:11:34 +0100
committerJohn Crispin <john@phrozen.org>2017-08-05 08:46:36 +0200
commit74d00a8c3849c1340efd713eb94b786e304c201f (patch)
treede481743de61c34da96ab5f9dba3af3edcfb8260 /target/linux/generic/pending-3.18/029-bcma-from-4.4.patch
parentde350550ef648d9728351b986b0516fa29465c45 (diff)
downloadupstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.gz
upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.bz2
upstream-74d00a8c3849c1340efd713eb94b786e304c201f.zip
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic/pending-3.18/029-bcma-from-4.4.patch')
-rw-r--r--target/linux/generic/pending-3.18/029-bcma-from-4.4.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/generic/pending-3.18/029-bcma-from-4.4.patch b/target/linux/generic/pending-3.18/029-bcma-from-4.4.patch
new file mode 100644
index 0000000000..5704081ee4
--- /dev/null
+++ b/target/linux/generic/pending-3.18/029-bcma-from-4.4.patch
@@ -0,0 +1,26 @@
+commit 55acca90da52b85299c033354e51ddaa7b73e019
+Author: Hante Meuleman <meuleman@broadcom.com>
+Date: Fri Sep 18 22:08:17 2015 +0200
+
+ brcmfmac: Add support for the BCM4365 and BCM4366 PCIE devices.
+
+ This patch adds support for the BCM4365 and BCM4366 11ac Wave2
+ PCIE devices.
+
+ Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+ Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+ Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+ Signed-off-by: Arend van Spriel <arend@broadcom.com>
+ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -151,6 +151,8 @@ struct bcma_host_ops {
+ #define BCMA_CORE_PCIE2 0x83C /* PCI Express Gen2 */
+ #define BCMA_CORE_USB30_DEV 0x83D
+ #define BCMA_CORE_ARM_CR4 0x83E
++#define BCMA_CORE_ARM_CA7 0x847
++#define BCMA_CORE_SYS_MEM 0x849
+ #define BCMA_CORE_DEFAULT 0xFFF
+
+ #define BCMA_MAX_NR_CORES 16