summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm47xx/setup.c
diff options
context:
space:
mode:
authorHauke Mehrtens2013-09-19 23:40:09 +0200
committerRalf Baechle2014-01-22 20:18:54 +0100
commitdd5732850e3dad3c578cf1523e7d3581cf5a815f (patch)
treeb8c33c50c7e8b2c986aaa5a815e705c40b949836 /arch/mips/bcm47xx/setup.c
parentMIPS: BCM63XX: drop SYS_HAS_CPU_MIPS32R1 (diff)
downloadkernel-qcow2-linux-dd5732850e3dad3c578cf1523e7d3581cf5a815f.tar.gz
kernel-qcow2-linux-dd5732850e3dad3c578cf1523e7d3581cf5a815f.tar.xz
kernel-qcow2-linux-dd5732850e3dad3c578cf1523e7d3581cf5a815f.zip
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> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/5865/
Diffstat (limited to 'arch/mips/bcm47xx/setup.c')
-rw-r--r--arch/mips/bcm47xx/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 1f30571968e7..de08ba95ebac 100644
--- 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
}