summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-01-14 12:06:08 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-01-24 22:39:51 +0100
commit7da4b6f8ffdbcddcb203d890617768af51d1ad91 (patch)
treeb987dcd1e93ab8fafac13e792d2fff6f60d64e20 /arch/mips
parente92e1d0d789634f8136c7ca1cb7d679acc3c52b0 (diff)
MIPS: BCM47XX: print board name in machine entry in cpuinfo
This will add the board name to the machine entry in /proc/cpuinfo. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/5864/
Diffstat (limited to 'arch/mips')
-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 de08ba95ebac..71e5c7cae814 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -32,6 +32,7 @@
#include <linux/ssb/ssb_embedded.h>
#include <linux/bcma/bcma_soc.h>
#include <asm/bootinfo.h>
+#include <asm/prom.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <bcm47xx.h>
@@ -225,6 +226,7 @@ void __init plat_mem_setup(void)
_machine_halt = bcm47xx_machine_halt;
pm_power_off = bcm47xx_machine_halt;
bcm47xx_board_detect();
+ mips_set_machine_name(bcm47xx_board_get_name());
}
static int __init bcm47xx_register_bus_complete(void)