From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 10 Feb 2012 22:42:43 +0000 (+0000)
Subject: brcm47xx: print the chip id and rev found by ssb and bcma
X-Git-Tag: reboot~14933
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=295a154f2f0d790b61a06d1bf962c91eb2302b51;p=openwrt%2Fstaging%2Fchunkeey.git

brcm47xx: print the chip id and rev found by ssb and bcma

SVN-Revision: 30428
---

diff --git a/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch b/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
new file mode 100644
index 0000000000..7ed7bc902a
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
@@ -0,0 +1,39 @@
+From 293fcc92dae1284c35a3bb51e7f9eb13b52e58fe Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Tue, 31 Jan 2012 23:36:44 +0100
+Subject: [PATCH 2/4] bcma: log the id, rev and pkg of the chip found
+
+This makes us see what type of hardware someone uses by the dmesg
+output.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/bcma/scan.c |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -380,6 +380,7 @@ static int bcma_get_next_core(struct bcm
+ void bcma_init_bus(struct bcma_bus *bus)
+ {
+ 	s32 tmp;
++	struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
+ 
+ 	if (bus->init_done)
+ 		return;
+@@ -390,9 +391,12 @@ void bcma_init_bus(struct bcma_bus *bus)
+ 	bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
+ 
+ 	tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);
+-	bus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
+-	bus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
+-	bus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
++	chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
++	chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
++	chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
++	pr_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
++		chipinfo->id, chipinfo->rev, chipinfo->pkg);
++
+ 	bus->init_done = true;
+ }
+ 
diff --git a/target/linux/brcm47xx/patches-3.2/0048-ssb-log-the-id-rev-and-pkg-of-the-chip-found.patch b/target/linux/brcm47xx/patches-3.2/0048-ssb-log-the-id-rev-and-pkg-of-the-chip-found.patch
new file mode 100644
index 0000000000..a5a8bc4c76
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.2/0048-ssb-log-the-id-rev-and-pkg-of-the-chip-found.patch
@@ -0,0 +1,25 @@
+From 7ddcc963030bbc82add2efbd49e696ae8aff3ae6 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Tue, 31 Jan 2012 23:38:36 +0100
+Subject: [PATCH 3/4] ssb: log the id, rev and pkg of the chip found
+
+This makes us see what type of hardware someone uses by the dmesg
+output.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/ssb/scan.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+--- a/drivers/ssb/scan.c
++++ b/drivers/ssb/scan.c
+@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			bus->chip_package = 0;
+ 		}
+ 	}
++	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
++		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
++		   bus->chip_package);
+ 	if (!bus->nr_devices)
+ 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
+ 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {