aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-10 00:18:39 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-10 00:18:39 +0000
commit8e2500205b6c8aa1332baa5db4a5194c911c1334 (patch)
treeb51a9922fd945f6fe5725e0ef5b62643f46548ae
parent09eb0166d0fd83b140318de191857998076dc950 (diff)
downloadupstream-8e2500205b6c8aa1332baa5db4a5194c911c1334.tar.gz
upstream-8e2500205b6c8aa1332baa5db4a5194c911c1334.tar.bz2
upstream-8e2500205b6c8aa1332baa5db4a5194c911c1334.zip
kernel: backport some bcma header file definitions from wireless-testing
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47284 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48165 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-3.18/029-bcma-from-4.4.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/029-bcma-from-4.4.patch b/target/linux/generic/patches-3.18/029-bcma-from-4.4.patch
new file mode 100644
index 0000000000..5704081ee4
--- /dev/null
+++ b/target/linux/generic/patches-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