aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-06 23:51:24 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-06 23:51:24 +0000
commitebf07787210deee29e3ad4f2308433866a853c20 (patch)
tree95dbee09e015f09478f9a01a319cb1aed75af16f /target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch
parent53a2c19c69d03bbdb81f1c27f9bc0b81b8da5ee4 (diff)
downloadupstream-ebf07787210deee29e3ad4f2308433866a853c20.tar.gz
upstream-ebf07787210deee29e3ad4f2308433866a853c20.tar.bz2
upstream-ebf07787210deee29e3ad4f2308433866a853c20.zip
brcm47xx: update board detection patches
Add patches like they are currently in the mainline mips tree and add some more pending patches for board detection. * Now the board name is shown under machine in /proc/cpuinfo. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38308
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch b/target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch
new file mode 100644
index 0000000000..c746279dc2
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch
@@ -0,0 +1,55 @@
+commit 7ad3b82f9d80ef8919dcfdfe7561e1a83e09c6bd
+Author: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Wed Sep 18 13:29:58 2013 +0200
+
+ MIPS: BCM47XX: Print board name in /proc/cpuinfo
+
+ Do not print the constant system type "Broadcom BCM47XX" but print the
+ name of the actual SoC in use and the detected board.
+
+ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ Cc: linux-mips@linux-mips.org
+ Patchwork: https://patchwork.linux-mips.org/patch/5839/
+ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+
+--- a/arch/mips/bcm47xx/prom.c
++++ b/arch/mips/bcm47xx/prom.c
+@@ -32,12 +32,37 @@
+ #include <asm/bootinfo.h>
+ #include <asm/fw/cfe/cfe_api.h>
+ #include <asm/fw/cfe/cfe_error.h>
++#include <bcm47xx.h>
++#include <bcm47xx_board.h>
+
+ static int cfe_cons_handle;
+
++static u16 get_chip_id(void)
++{
++ switch (bcm47xx_bus_type) {
++#ifdef CONFIG_BCM47XX_SSB
++ case BCM47XX_BUS_TYPE_SSB:
++ return bcm47xx_bus.ssb.chip_id;
++#endif
++#ifdef CONFIG_BCM47XX_BCMA
++ case BCM47XX_BUS_TYPE_BCMA:
++ return bcm47xx_bus.bcma.bus.chipinfo.id;
++#endif
++ }
++ return 0;
++}
++
+ const char *get_system_type(void)
+ {
+- return "Broadcom BCM47XX";
++ static char buf[50];
++ u16 chip_id = get_chip_id();
++
++ snprintf(buf, sizeof(buf),
++ (chip_id > 0x9999) ? "Broadcom BCM%d (%s)" :
++ "Broadcom BCM%04X (%s)",
++ chip_id, bcm47xx_board_get_name());
++
++ return buf;
+ }
+
+ void prom_putchar(char c)