2015-10-30 15:17:41 +00:00
|
|
|
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
|
2016-01-04 12:22:24 +00:00
|
|
|
--- a/drivers/bcma/main.c
|
|
|
|
|
+++ b/drivers/bcma/main.c
|
|
|
|
|
@@ -436,13 +436,8 @@ int bcma_bus_register(struct bcma_bus *b
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dev = bcma_bus_get_host_dev(bus);
|
|
|
|
|
- /* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when
|
|
|
|
|
- * of_default_bus_match_table is exported or in some other way
|
|
|
|
|
- * accessible. This is just a temporary workaround.
|
|
|
|
|
- */
|
|
|
|
|
- if (IS_BUILTIN(CONFIG_BCMA) && dev) {
|
|
|
|
|
- of_platform_populate(dev->of_node, of_default_bus_match_table,
|
|
|
|
|
- NULL, dev);
|
|
|
|
|
+ if (dev) {
|
|
|
|
|
+ of_platform_default_populate(dev->of_node, NULL, dev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Cores providing flash access go before SPROM init */
|
