summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-05-31 22:38:22 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-06-06 15:20:22 -0400
commitccaf8c32d5ed08bfb4c45492f8f1c145fd45f4e8 (patch)
tree44391909839833768d9aa180fbc79d3f97be41eb
parent3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76 (diff)
downloadlinux-ccaf8c32d5ed08bfb4c45492f8f1c145fd45f4e8.tar.gz
linux-ccaf8c32d5ed08bfb4c45492f8f1c145fd45f4e8.tar.bz2
linux-ccaf8c32d5ed08bfb4c45492f8f1c145fd45f4e8.zip
ssb: recognize ARM Cortex M3
I found this core on a BCM4322, a PCI card in the Linksys WRT610N V1. This core is not used by the driver, this patch just makes ssb show the correct name. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/ssb/scan.c2
-rw-r--r--include/linux/ssb/ssb.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 266c7c5c86dc..ab4627cf1114 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -90,6 +90,8 @@ const char *ssb_core_name(u16 coreid)
return "ARM 1176";
case SSB_DEV_ARM_7TDMI:
return "ARM 7TDMI";
+ case SSB_DEV_ARM_CM3:
+ return "ARM Cortex M3";
}
return "UNKNOWN";
}
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index bc14bd738ade..bb674c02f306 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -243,6 +243,7 @@ struct ssb_bus_ops {
#define SSB_DEV_MINI_MACPHY 0x823
#define SSB_DEV_ARM_1176 0x824
#define SSB_DEV_ARM_7TDMI 0x825
+#define SSB_DEV_ARM_CM3 0x82A
/* Vendor-ID values */
#define SSB_VENDOR_BROADCOM 0x4243