diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-26 20:34:00 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-26 20:34:00 +0000 |
| commit | 05623aebefb8c55d40e3c6795b40ca046a8e6181 (patch) | |
| tree | 7586b3f4b33d49a5fa07ddfe63fd559b8aab3d4d /target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch | |
| parent | a83d7bb109266706bf06e1984e16cd0c470c090f (diff) | |
| download | upstream-05623aebefb8c55d40e3c6795b40ca046a8e6181.tar.gz upstream-05623aebefb8c55d40e3c6795b40ca046a8e6181.tar.bz2 upstream-05623aebefb8c55d40e3c6795b40ca046a8e6181.zip | |
brcm47xx: add initial board detection code
SVN-Revision: 35322
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch b/target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch new file mode 100644 index 0000000000..abfa4004f2 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch @@ -0,0 +1,39 @@ +--- a/arch/mips/bcm47xx/prom.c ++++ b/arch/mips/bcm47xx/prom.c +@@ -32,10 +32,35 @@ + #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 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[128]; ++ 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; + } + + static __init int prom_init_cfe(void) |