aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/86xx
diff options
context:
space:
mode:
authorBecky Bruce <becky.bruce@freescale.com>2008-09-24 17:53:34 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-09-29 10:23:06 -0400
commit0161dca52d950676d727336cef1441ea2bcfba98 (patch)
tree1cded5d1b34d2a6ce156391c17645ee39c7c386c /arch/powerpc/platforms/86xx
parent20d38e01d48019c578ab0ec1464454c03003b300 (diff)
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>
Diffstat (limited to 'arch/powerpc/platforms/86xx')
-rw-r--r--arch/powerpc/platforms/86xx/gef_sbc610.c8
-rw-r--r--arch/powerpc/platforms/86xx/mpc86xx_hpcn.c8
-rw-r--r--arch/powerpc/platforms/86xx/sbc8641d.c8
3 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index 3543a9e67618..8a9dee247618 100644
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -66,19 +66,11 @@ static void __init gef_sbc610_setup_arch(void)
66 66
67static void gef_sbc610_show_cpuinfo(struct seq_file *m) 67static void gef_sbc610_show_cpuinfo(struct seq_file *m)
68{ 68{
69 struct device_node *root;
70 uint memsize = total_memory; 69 uint memsize = total_memory;
71 const char *model = "";
72 uint svid = mfspr(SPRN_SVR); 70 uint svid = mfspr(SPRN_SVR);
73 71
74 seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n"); 72 seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
75 73
76 root = of_find_node_by_path("/");
77 if (root)
78 model = of_get_property(root, "model", NULL);
79 seq_printf(m, "Machine\t\t: %s\n", model);
80 of_node_put(root);
81
82 seq_printf(m, "SVR\t\t: 0x%x\n", svid); 74 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
83 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); 75 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
84} 76}
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index f712d9c0991b..2672829a71dc 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -101,19 +101,11 @@ mpc86xx_hpcn_setup_arch(void)
101static void 101static void
102mpc86xx_hpcn_show_cpuinfo(struct seq_file *m) 102mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
103{ 103{
104 struct device_node *root;
105 uint memsize = total_memory; 104 uint memsize = total_memory;
106 const char *model = "";
107 uint svid = mfspr(SPRN_SVR); 105 uint svid = mfspr(SPRN_SVR);
108 106
109 seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n"); 107 seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
110 108
111 root = of_find_node_by_path("/");
112 if (root)
113 model = of_get_property(root, "model", NULL);
114 seq_printf(m, "Machine\t\t: %s\n", model);
115 of_node_put(root);
116
117 seq_printf(m, "SVR\t\t: 0x%x\n", svid); 109 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
118 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); 110 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
119} 111}
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 00e6fad3b3ca..da677a74e2d1 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -63,19 +63,11 @@ sbc8641_setup_arch(void)
63static void 63static void
64sbc8641_show_cpuinfo(struct seq_file *m) 64sbc8641_show_cpuinfo(struct seq_file *m)
65{ 65{
66 struct device_node *root;
67 uint memsize = total_memory; 66 uint memsize = total_memory;
68 const char *model = "";
69 uint svid = mfspr(SPRN_SVR); 67 uint svid = mfspr(SPRN_SVR);
70 68
71 seq_printf(m, "Vendor\t\t: Wind River Systems\n"); 69 seq_printf(m, "Vendor\t\t: Wind River Systems\n");
72 70
73 root = of_find_node_by_path("/");
74 if (root)
75 model = of_get_property(root, "model", NULL);
76 seq_printf(m, "Machine\t\t: %s\n", model);
77 of_node_put(root);
78
79 seq_printf(m, "SVR\t\t: 0x%x\n", svid); 71 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
80 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); 72 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
81} 73}