diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-06 23:51:24 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-06 23:51:24 +0000 |
| commit | b82d0dc241632d33e8208c35dafae017fc872c6e (patch) | |
| tree | ea9b5c71904a9b212028679c821940aea9dcc212 /target/linux/brcm47xx/patches-3.10/071-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch | |
| parent | 6dee82eeb0f03b89217ef0df0d82fc5595e3f292 (diff) | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38308 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 55 |
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) |