[PATCH 1/2] bcma: identify bus cores (devices) found on BCM47189

[PATCH 1/2] bcma: identify bus cores (devices) found on BCM47189

[Rafał Miłecki]

Add missing defines and print proper names.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 drivers/bcma/scan.c       | 3 +++
 include/linux/bcma/bcma.h | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index df806b9..5ee7311 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 3feb1b2..991ebb4 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
-- 
1.8.4.5

[PATCH 2/2] bcma: support chipsets with PMU and GCI cores (devices)

[Rafał Miłecki]

Both cores are another exceptions. They are not accessed in a standard
way and to they don't need or have wrapping addresses.
This fixes bus scanning after finding such core.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 drivers/bcma/scan.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 5ee7311..4a2d1b2 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -318,6 +318,8 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
 		switch (core->id.id) {
 		case BCMA_CORE_4706_MAC_GBIT_COMMON:
 		case BCMA_CORE_NS_CHIPCOMMON_B:
+		case BCMA_CORE_PMU:
+		case BCMA_CORE_GCI:
 		/* Not used yet: case BCMA_CORE_OOB_ROUTER: */
 			break;
 		default:
-- 
1.8.4.5

Re: [PATCH 1/2] bcma: identify bus cores (devices) found on BCM47189

[Kalle Valo]

Rafał Miłecki <zajec5@gmail.com> writes:

> Add missing defines and print proper names.
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

Manually applied both patches to wireless-drivers-next.git, thanks.

-- 
Kalle Valo