diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2013-10-06 23:51:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-10-06 23:51:24 +0000 |
commit | cd2b261f51e3181ccd63899e26cdb0a91002fc75 (patch) | |
tree | ea9b5c71904a9b212028679c821940aea9dcc212 /target/linux/brcm47xx/patches-3.10/072-MIPS-BCM47XX-only-print-SoC-name-in-system-type-in-c.patch | |
parent | 1e03d9f0eefdfac8274d67c1d32e781e89e2058a (diff) | |
download | upstream-cd2b261f51e3181ccd63899e26cdb0a91002fc75.tar.gz upstream-cd2b261f51e3181ccd63899e26cdb0a91002fc75.tar.bz2 upstream-cd2b261f51e3181ccd63899e26cdb0a91002fc75.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38308 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/072-MIPS-BCM47XX-only-print-SoC-name-in-system-type-in-c.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.10/072-MIPS-BCM47XX-only-print-SoC-name-in-system-type-in-c.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/072-MIPS-BCM47XX-only-print-SoC-name-in-system-type-in-c.patch b/target/linux/brcm47xx/patches-3.10/072-MIPS-BCM47XX-only-print-SoC-name-in-system-type-in-c.patch new file mode 100644 index 0000000000..1993cf5a44 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/072-MIPS-BCM47XX-only-print-SoC-name-in-system-type-in-c.patch @@ -0,0 +1,83 @@ +commit 88aaea30099c1562c4b4015d965c22df29034a74 +Author: Hauke Mehrtens <hauke@hauke-m.de> +Date: Thu Sep 19 22:01:53 2013 +0200 + + MIPS: BCM47XX: only print SoC name in system type in cpuinfo + + Recently the output of "system type" in /proc/cpuinfo was changed to + Broadcom BCM4730 (Some sample board), but it is better to just print + the SoC name in the "system type" entry. The board name will be added + in the machine entry later. + + Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + +--- a/arch/mips/bcm47xx/prom.c ++++ b/arch/mips/bcm47xx/prom.c +@@ -37,32 +37,19 @@ + + 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; +-} ++static char bcm47xx_system_type[20] = "Broadcom BCM47XX"; + + const char *get_system_type(void) + { +- 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 bcm47xx_system_type; ++} + +- return buf; ++__init void bcm47xx_set_system_type(u16 chip_id) ++{ ++ snprintf(bcm47xx_system_type, sizeof(bcm47xx_system_type), ++ (chip_id > 0x9999) ? "Broadcom BCM%d" : ++ "Broadcom BCM%04X", ++ chip_id); + } + + void prom_putchar(char c) +--- a/arch/mips/bcm47xx/setup.c ++++ b/arch/mips/bcm47xx/setup.c +@@ -210,12 +210,14 @@ void __init plat_mem_setup(void) + #ifdef CONFIG_BCM47XX_BCMA + bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA; + bcm47xx_register_bcma(); ++ bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id); + #endif + } else { + printk(KERN_INFO "bcm47xx: using ssb bus\n"); + #ifdef CONFIG_BCM47XX_SSB + bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB; + bcm47xx_register_ssb(); ++ bcm47xx_set_system_type(bcm47xx_bus.ssb.chip_id); + #endif + } + +--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h ++++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h +@@ -56,4 +56,6 @@ void bcm47xx_fill_bcma_boardinfo(struct + const char *prefix); + #endif + ++void bcm47xx_set_system_type(u16 chip_id); ++ + #endif /* __ASM_BCM47XX_H */ |