ChangeSet 1.2231.1.24, 2005/03/28 19:22:59-08:00, [EMAIL PROTECTED]
[PATCH] ppc32: Report chipset version in common /proc/cpuinfo handling
Moved reporting of chipset revision from board specific to common
handing
of /proc/cpuinfo. In light of numerous PPC system-on-chip devices, we
report both the cpu version (reflects the core version) and the chipset
version (reflects the system-on-chip or bridge version).
Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
kernel/setup.c | 10 ++++++++++
platforms/83xx/mpc834x_sys.c | 1 -
platforms/85xx/mpc85xx_ads_common.c | 1 -
platforms/85xx/mpc85xx_cds_common.c | 1 -
platforms/85xx/sbc85xx.c | 1 -
platforms/85xx/stx_gp3.c | 1 -
6 files changed, 10 insertions(+), 5 deletions(-)
diff -Nru a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
--- a/arch/ppc/kernel/setup.c 2005-03-28 21:11:40 -08:00
+++ b/arch/ppc/kernel/setup.c 2005-03-28 21:11:40 -08:00
@@ -41,6 +41,10 @@
#include <asm/xmon.h>
#include <asm/ocp.h>
+#if defined(CONFIG_85xx) || defined(CONFIG_83xx)
+#include <asm/ppc_sys.h>
+#endif
+
#if defined CONFIG_KGDB
#include <asm/kgdb.h>
#endif
@@ -245,6 +249,12 @@
seq_printf(m, "bogomips\t: %lu.%02lu\n",
lpj / (500000/HZ), (lpj / (5000/HZ)) % 100);
+
+#if defined(CONFIG_85xx) || defined(CONFIG_83xx)
+ if (cur_ppc_sys_spec->ppc_sys_name)
+ seq_printf(m, "chipset\t\t: %s\n",
+ cur_ppc_sys_spec->ppc_sys_name);
+#endif
#ifdef CONFIG_SMP
seq_printf(m, "\n");
diff -Nru a/arch/ppc/platforms/83xx/mpc834x_sys.c
b/arch/ppc/platforms/83xx/mpc834x_sys.c
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c 2005-03-28 21:11:40 -08:00
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c 2005-03-28 21:11:40 -08:00
@@ -143,7 +143,6 @@
pvid = mfspr(SPRN_PVR);
svid = mfspr(SPRN_SVR);
- seq_printf(m, "chip\t\t: MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "Vendor\t\t: Freescale Inc.\n");
seq_printf(m, "Machine\t\t: mpc%s sys\n",
cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "core clock\t: %d MHz\n"
diff -Nru a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c 2005-03-28 21:11:40
-08:00
+++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c 2005-03-28 21:11:40
-08:00
@@ -129,7 +129,6 @@
pvid = mfspr(SPRN_PVR);
svid = mfspr(SPRN_SVR);
- seq_printf(m, "chip\t\t: MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
seq_printf(m, "Machine\t\t: mpc%sads\n",
cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
diff -Nru a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c 2005-03-28 21:11:40
-08:00
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c 2005-03-28 21:11:40
-08:00
@@ -146,7 +146,6 @@
pvid = mfspr(SPRN_PVR);
svid = mfspr(SPRN_SVR);
- seq_printf(m, "chip\t\t: MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
seq_printf(m, "Machine\t\t: CDS - MPC%s (%x)\n",
cur_ppc_sys_spec->ppc_sys_name, cadmus[CM_VER]);
seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
diff -Nru a/arch/ppc/platforms/85xx/sbc85xx.c
b/arch/ppc/platforms/85xx/sbc85xx.c
--- a/arch/ppc/platforms/85xx/sbc85xx.c 2005-03-28 21:11:40 -08:00
+++ b/arch/ppc/platforms/85xx/sbc85xx.c 2005-03-28 21:11:40 -08:00
@@ -129,7 +129,6 @@
pvid = mfspr(SPRN_PVR);
svid = mfspr(SPRN_SVR);
- seq_printf(m, "chip\t\t: MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "Vendor\t\t: Wind River\n");
seq_printf(m, "Machine\t\t: SBC%s\n", cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
diff -Nru a/arch/ppc/platforms/85xx/stx_gp3.c
b/arch/ppc/platforms/85xx/stx_gp3.c
--- a/arch/ppc/platforms/85xx/stx_gp3.c 2005-03-28 21:11:40 -08:00
+++ b/arch/ppc/platforms/85xx/stx_gp3.c 2005-03-28 21:11:40 -08:00
@@ -268,7 +268,6 @@
memsize = total_memory;
- seq_printf(m, "chip\t\t: MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "Vendor\t\t: RPC Electronics STx \n");
seq_printf(m, "Machine\t\t: GP3 - MPC%s\n",
cur_ppc_sys_spec->ppc_sys_name);
seq_printf(m, "bus freq\t: %u.%.6u MHz\n", freq / 1000000,
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
