powerpc: Drop redundant machine type print in show_cpuinfo
For many of the embedded boards, "model" and "Machine" are printing the same thing; remove the redundant code and allow the generic show_cpuinfo to print the model information. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
20d38e01d4
commit
0161dca52d
arch/powerpc/platforms
|
@ -213,7 +213,6 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
|
||||||
svid = mfspr(SPRN_SVR);
|
svid = mfspr(SPRN_SVR);
|
||||||
|
|
||||||
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
|
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
|
||||||
seq_printf(m, "Machine\t\t: mpc85xx\n");
|
|
||||||
seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
|
seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
|
||||||
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
||||||
|
|
||||||
|
|
|
@ -200,7 +200,6 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)
|
||||||
svid = mfspr(SPRN_SVR);
|
svid = mfspr(SPRN_SVR);
|
||||||
|
|
||||||
seq_printf(m, "Vendor\t\t: Wind River\n");
|
seq_printf(m, "Vendor\t\t: Wind River\n");
|
||||||
seq_printf(m, "Machine\t\t: SBC8560\n");
|
|
||||||
seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
|
seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
|
||||||
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
||||||
|
|
||||||
|
|
|
@ -66,19 +66,11 @@ static void __init gef_sbc610_setup_arch(void)
|
||||||
|
|
||||||
static void gef_sbc610_show_cpuinfo(struct seq_file *m)
|
static void gef_sbc610_show_cpuinfo(struct seq_file *m)
|
||||||
{
|
{
|
||||||
struct device_node *root;
|
|
||||||
uint memsize = total_memory;
|
uint memsize = total_memory;
|
||||||
const char *model = "";
|
|
||||||
uint svid = mfspr(SPRN_SVR);
|
uint svid = mfspr(SPRN_SVR);
|
||||||
|
|
||||||
seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
|
seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
|
||||||
|
|
||||||
root = of_find_node_by_path("/");
|
|
||||||
if (root)
|
|
||||||
model = of_get_property(root, "model", NULL);
|
|
||||||
seq_printf(m, "Machine\t\t: %s\n", model);
|
|
||||||
of_node_put(root);
|
|
||||||
|
|
||||||
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
||||||
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
|
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,19 +101,11 @@ mpc86xx_hpcn_setup_arch(void)
|
||||||
static void
|
static void
|
||||||
mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
|
mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
|
||||||
{
|
{
|
||||||
struct device_node *root;
|
|
||||||
uint memsize = total_memory;
|
uint memsize = total_memory;
|
||||||
const char *model = "";
|
|
||||||
uint svid = mfspr(SPRN_SVR);
|
uint svid = mfspr(SPRN_SVR);
|
||||||
|
|
||||||
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
|
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
|
||||||
|
|
||||||
root = of_find_node_by_path("/");
|
|
||||||
if (root)
|
|
||||||
model = of_get_property(root, "model", NULL);
|
|
||||||
seq_printf(m, "Machine\t\t: %s\n", model);
|
|
||||||
of_node_put(root);
|
|
||||||
|
|
||||||
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
||||||
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
|
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,19 +63,11 @@ sbc8641_setup_arch(void)
|
||||||
static void
|
static void
|
||||||
sbc8641_show_cpuinfo(struct seq_file *m)
|
sbc8641_show_cpuinfo(struct seq_file *m)
|
||||||
{
|
{
|
||||||
struct device_node *root;
|
|
||||||
uint memsize = total_memory;
|
uint memsize = total_memory;
|
||||||
const char *model = "";
|
|
||||||
uint svid = mfspr(SPRN_SVR);
|
uint svid = mfspr(SPRN_SVR);
|
||||||
|
|
||||||
seq_printf(m, "Vendor\t\t: Wind River Systems\n");
|
seq_printf(m, "Vendor\t\t: Wind River Systems\n");
|
||||||
|
|
||||||
root = of_find_node_by_path("/");
|
|
||||||
if (root)
|
|
||||||
model = of_get_property(root, "model", NULL);
|
|
||||||
seq_printf(m, "Machine\t\t: %s\n", model);
|
|
||||||
of_node_put(root);
|
|
||||||
|
|
||||||
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
|
||||||
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
|
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,7 +164,6 @@ static void __init mpc7448_hpc2_init_IRQ(void)
|
||||||
void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
|
void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
|
||||||
{
|
{
|
||||||
seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
|
seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
|
||||||
seq_printf(m, "machine\t\t: MPC7448hpc2\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void mpc7448_hpc2_restart(char *cmd)
|
void mpc7448_hpc2_restart(char *cmd)
|
||||||
|
|
Loading…
Reference in New Issue