leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: BCM47XX: only print SoC name in system type in cpuinfo

Browse Source 
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>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5865/
This commit is contained in:
Hauke Mehrtens 2013-09-19 23:40:09 +02:00 committed by Ralf Baechle
parent 3a705ab184
commit dd5732850e
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/mips/bcm47xx/prom.c
View File

@ -37,32 +37,19 @@
static int cfe_cons_handle; static int cfe_cons_handle;
static u16 get_chip_id(void) static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
{
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) const char *get_system_type(void)
{ {
static char buf[50]; return bcm47xx_system_type;
u16 chip_id = get_chip_id(); }
snprintf(buf, sizeof(buf), __init void bcm47xx_set_system_type(u16 chip_id)
(chip_id > 0x9999) ? "Broadcom BCM%d (%s)" : {
"Broadcom BCM%04X (%s)", snprintf(bcm47xx_system_type, sizeof(bcm47xx_system_type),
chip_id, bcm47xx_board_get_name()); (chip_id > 0x9999) ? "Broadcom BCM%d" :
"Broadcom BCM%04X",
return buf; chip_id);
} }
void prom_putchar(char c) void prom_putchar(char c)

2
arch/mips/bcm47xx/setup.c
View File

@ -210,12 +210,14 @@ void __init plat_mem_setup(void)
#ifdef CONFIG_BCM47XX_BCMA #ifdef CONFIG_BCM47XX_BCMA
bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA; bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;
bcm47xx_register_bcma(); bcm47xx_register_bcma();
bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id);
#endif #endif
} else { } else {
printk(KERN_INFO "bcm47xx: using ssb bus\n"); printk(KERN_INFO "bcm47xx: using ssb bus\n");
#ifdef CONFIG_BCM47XX_SSB #ifdef CONFIG_BCM47XX_SSB
bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB; bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
bcm47xx_register_ssb(); bcm47xx_register_ssb();
bcm47xx_set_system_type(bcm47xx_bus.ssb.chip_id);
#endif #endif
} }

2
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
View File

@ -56,4 +56,6 @@ void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
const char *prefix); const char *prefix);
#endif #endif
void bcm47xx_set_system_type(u16 chip_id);
#endif /* __ASM_BCM47XX_H */ #endif /* __ASM_BCM47XX_H */