niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] powerpc: Some minor cleanups to setup_32.c

Browse source 
* Removed of_show_percpuinfo and just report CPU frequency in generic
  show_cpuinfo code.
* Killed OCP and PPC_SYS related code which doesn't belong in the
  merge tree

Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Kumar Gala 2005-10-25 23:57:33 -05:00 • committed by Paul Mackerras
parent 0fd6f71794
commit 6d7f58b04d
2 changed files with 8 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
arch/powerpc/kernel/setup_32.c
View file

@ -39,15 +39,7 @@
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/nvram.h> #include <asm/nvram.h>
#include <asm/xmon.h> #include <asm/xmon.h>
#include <asm/ocp.h> #include <asm/time.h>
#define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \
defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
defined(CONFIG_PPC_MPC52xx))
#if USES_PPC_SYS
#include <asm/ppc_sys.h>
#endif
#if defined CONFIG_KGDB #if defined CONFIG_KGDB
#include <asm/kgdb.h> #include <asm/kgdb.h>
@ -234,18 +226,19 @@ int show_cpuinfo(struct seq_file *m, void *v)
} }
} }
/*
* Assume here that all clock rates are the same in a
* smp system. -- Cort
*/
seq_printf(m, "clock\t\t: %lu.%06luMHz\n", ppc_proc_freq / 1000000,
ppc_proc_freq % 1000000);
seq_printf(m, "revision\t: %hd.%hd (pvr %04x %04x)\n", seq_printf(m, "revision\t: %hd.%hd (pvr %04x %04x)\n",
maj, min, PVR_VER(pvr), PVR_REV(pvr)); maj, min, PVR_VER(pvr), PVR_REV(pvr));
seq_printf(m, "bogomips\t: %lu.%02lu\n", seq_printf(m, "bogomips\t: %lu.%02lu\n",
lpj / (500000/HZ), (lpj / (5000/HZ)) % 100); lpj / (500000/HZ), (lpj / (5000/HZ)) % 100);
#if USES_PPC_SYS
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 #ifdef CONFIG_SMP
seq_printf(m, "\n"); seq_printf(m, "\n");
#endif #endif
@ -305,28 +298,6 @@ unsigned long __init early_init(unsigned long dt_ptr)
} }
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
/*
* Assume here that all clock rates are the same in a
* smp system. -- Cort
*/
int
of_show_percpuinfo(struct seq_file *m, int i)
{
struct device_node *cpu_node;
u32 *fp;
int s;
cpu_node = find_type_devices("cpu");
if (!cpu_node)
return 0;
for (s = 0; s < i && cpu_node->next; s++)
cpu_node = cpu_node->next;
fp = (u32 *)get_property(cpu_node, "clock-frequency", NULL);
if (fp)
seq_printf(m, "clock\t\t: %dMHz\n", *fp / 1000000);
return 0;
}
void __init void __init
intuit_machine_type(void) intuit_machine_type(void)
{ {

3
arch/powerpc/platforms/powermac/setup.c
View file

@ -202,9 +202,6 @@ static void pmac_show_percpuinfo(struct seq_file *m, int i)
return; return;
} }
#endif /* CONFIG_CPU_FREQ_PMAC */ #endif /* CONFIG_CPU_FREQ_PMAC */
#ifdef CONFIG_PPC32
of_show_percpuinfo(m, i);
#endif
} }
#ifndef CONFIG_ADB_CUDA #ifndef CONFIG_ADB_CUDA