diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-15 18:48:52 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2016-02-06 06:34:50 -0500 |
commit | 7267bcda332e2782e21a559f3b1b859a35b4062d (patch) | |
tree | 05b2ba93a9f43bf8165d793accb61c2540d4c3e6 | |
parent | 1b3b36b044939b438c4463e8bde8cd644ba82032 (diff) |
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.c | 3 | ||||
-rw-r--r-- | include/linux/bcma/bcma.h | 2 |
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[] = { | |||
98 | { BCMA_CORE_SHIM, "SHIM" }, | 98 | { BCMA_CORE_SHIM, "SHIM" }, |
99 | { BCMA_CORE_PCIE2, "PCIe Gen2" }, | 99 | { BCMA_CORE_PCIE2, "PCIe Gen2" }, |
100 | { BCMA_CORE_ARM_CR4, "ARM CR4" }, | 100 | { BCMA_CORE_ARM_CR4, "ARM CR4" }, |
101 | { BCMA_CORE_GCI, "GCI" }, | ||
102 | { BCMA_CORE_CMEM, "CNDS DDR2/3 memory controller" }, | ||
103 | { BCMA_CORE_ARM_CA7, "ARM CA7" }, | ||
101 | { BCMA_CORE_DEFAULT, "Default" }, | 104 | { BCMA_CORE_DEFAULT, "Default" }, |
102 | }; | 105 | }; |
103 | 106 | ||
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 { | |||
151 | #define BCMA_CORE_PCIE2 0x83C /* PCI Express Gen2 */ | 151 | #define BCMA_CORE_PCIE2 0x83C /* PCI Express Gen2 */ |
152 | #define BCMA_CORE_USB30_DEV 0x83D | 152 | #define BCMA_CORE_USB30_DEV 0x83D |
153 | #define BCMA_CORE_ARM_CR4 0x83E | 153 | #define BCMA_CORE_ARM_CR4 0x83E |
154 | #define BCMA_CORE_GCI 0x840 | ||
155 | #define BCMA_CORE_CMEM 0x846 /* CNDS DDR2/3 memory controller */ | ||
154 | #define BCMA_CORE_ARM_CA7 0x847 | 156 | #define BCMA_CORE_ARM_CA7 0x847 |
155 | #define BCMA_CORE_SYS_MEM 0x849 | 157 | #define BCMA_CORE_SYS_MEM 0x849 |
156 | #define BCMA_CORE_DEFAULT 0xFFF | 158 | #define BCMA_CORE_DEFAULT 0xFFF |