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>

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index df806b9c549084fab8e61569718b2441485f17e4..5ee731132365d4d52dde5ca7c76f412d76cedd64 100644 (file)
--- 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 3feb1b2d75d87b83febb605a86720b06a8132d3f..991ebb4c20155b3cd733e8750411d0f4324f7a8a 100644 (file)
--- 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