summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-16 00:48:52 +0100
committerKalle Valo <kvalo@codeaurora.org>2016-02-06 13:34:50 +0200
commit7267bcda332e2782e21a559f3b1b859a35b4062d (patch)
tree05b2ba93a9f43bf8165d793accb61c2540d4c3e6
parent1b3b36b044939b438c4463e8bde8cd644ba82032 (diff)
downloadlinux-7267bcda332e2782e21a559f3b1b859a35b4062d.tar.gz
linux-7267bcda332e2782e21a559f3b1b859a35b4062d.tar.bz2
linux-7267bcda332e2782e21a559f3b1b859a35b4062d.zip
bcma: identify bus cores (devices) found on BCM47189
Add missing defines and print proper names. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/bcma/scan.c3
-rw-r--r--include/linux/bcma/bcma.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index df806b9c5490..5ee731132365 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -98,6 +98,9 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = {
{ BCMA_CORE_SHIM, "SHIM" },
{ BCMA_CORE_PCIE2, "PCIe Gen2" },
{ BCMA_CORE_ARM_CR4, "ARM CR4" },
+ { BCMA_CORE_GCI, "GCI" },
+ { BCMA_CORE_CMEM, "CNDS DDR2/3 memory controller" },
+ { BCMA_CORE_ARM_CA7, "ARM CA7" },
{ BCMA_CORE_DEFAULT, "Default" },
};
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 3feb1b2d75d8..991ebb4c2015 100644
--- 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_GCI 0x840
+#define BCMA_CORE_CMEM 0x846 /* CNDS DDR2/3 memory controller */
#define BCMA_CORE_ARM_CA7 0x847
#define BCMA_CORE_SYS_MEM 0x849
#define BCMA_CORE_DEFAULT 0xFFF