4 files changed, 4 insertions, 80 deletions

diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile
index 28b8aebb35ea..d50d4764eafe 100644
--- a/arch/mips/alchemy/common/Makefile
+++ b/arch/mips/alchemy/common/Makefile
@@ -7,7 +7,7 @@
 
 obj-y += prom.o irq.o puts.o time.o reset.o \
         clocks.o platform.o power.o setup.o \
-        sleeper.o cputable.o dma.o dbdma.o gpio.o
+        sleeper.o dma.o dbdma.o gpio.o
 
 obj-$(CONFIG_PCI)               += pci.o
 
diff --git a/arch/mips/alchemy/common/cputable.c b/arch/mips/alchemy/common/cputable.c
deleted file mode 100644
index ba6430bc2d03..000000000000
--- a/arch/mips/alchemy/common/cputable.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  arch/mips/au1000/common/cputable.c
- *
- *  Copyright (C) 2004 Dan Malek (dan@embeddededge.com)
- *      Copied from PowerPC and updated for Alchemy Au1xxx processors.
- *
- *  Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#include <asm/mach-au1x00/au1000.h>
-
-struct cpu_spec *cur_cpu_spec[NR_CPUS];
-
-/* With some thought, we can probably use the mask to reduce the
- * size of the table.
- */
-struct cpu_spec cpu_specs[] = {
-        { 0xffffffff, 0x00030100, "Au1000 DA", 1, 0, 1 },
-        { 0xffffffff, 0x00030201, "Au1000 HA", 1, 0, 1 },
-        { 0xffffffff, 0x00030202, "Au1000 HB", 1, 0, 1 },
-        { 0xffffffff, 0x00030203, "Au1000 HC", 1, 1, 0 },
-        { 0xffffffff, 0x00030204, "Au1000 HD", 1, 1, 0 },
-        { 0xffffffff, 0x01030200, "Au1500 AB", 1, 1, 0 },
-        { 0xffffffff, 0x01030201, "Au1500 AC", 0, 1, 0 },
-        { 0xffffffff, 0x01030202, "Au1500 AD", 0, 1, 0 },
-        { 0xffffffff, 0x02030200, "Au1100 AB", 1, 1, 0 },
-        { 0xffffffff, 0x02030201, "Au1100 BA", 1, 1, 0 },
-        { 0xffffffff, 0x02030202, "Au1100 BC", 1, 1, 0 },
-        { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1, 0 },
-        { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1, 0 },
-        { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1, 0 },
-        { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0, 0 },
-        { 0xffffffff, 0x04030201, "Au1200 AC", 1, 0, 0 },
-        { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0, 0 }
-};
-
-void set_cpuspec(void)
-{
-        struct  cpu_spec *sp;
-        u32     prid;
-
-        prid = read_c0_prid();
-        sp = cpu_specs;
-        while ((prid & sp->prid_mask) != sp->prid_value)
-                sp++;
-        cur_cpu_spec[0] = sp;
-}
diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index 9889ec3ba4c4..4d42be811e7f 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -44,37 +44,13 @@ extern void set_cpuspec(void);
 
 void __init plat_mem_setup(void)
 {
-        struct  cpu_spec *sp;
-        unsigned long prid, cpufreq, bclk;
-
-        set_cpuspec();
-        sp = cur_cpu_spec[0];
-
         _machine_restart = au1000_restart;
         _machine_halt = au1000_halt;
         pm_power_off = au1000_power_off;
 
         board_setup();  /* board specific setup */
 
-        prid = read_c0_prid();
-        if (sp->cpu_pll_wo)
-#ifdef CONFIG_SOC_AU1000_FREQUENCY
-                cpufreq = CONFIG_SOC_AU1000_FREQUENCY / 1000000;
-#else
-                cpufreq = 396;
-#endif
-        else
-                cpufreq = (au_readl(SYS_CPUPLL) & 0x3F) * 12;
-        printk(KERN_INFO "(PRID %08lx) @ %ld MHz\n", prid, cpufreq);
-
-        if (sp->cpu_bclk) {
-                /* Enable BCLK switching */
-                bclk = au_readl(SYS_POWERCTRL);
-                au_writel(bclk | 0x60, SYS_POWERCTRL);
-                printk(KERN_INFO "BCLK switching enabled!\n");
-        }
-
-        if (sp->cpu_od)
+        if (au1xxx_cpu_needs_config_od())
                 /* Various early Au1xx0 errata corrected by this */
                 set_c0_config(1 << 19); /* Set Config[OD] */
         else
diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c
index 68d714258e92..15185708ad8c 100644
--- a/arch/mips/alchemy/common/time.c
+++ b/arch/mips/alchemy/common/time.c
@@ -198,7 +198,7 @@ unsigned long calc_clock(void)
          * silicon versions of Au1000 are not sold by AMD, we don't bend
          * over backwards trying to determine the frequency.
          */
-        if (cur_cpu_spec[0]->cpu_pll_wo)
+        if (au1xxx_cpu_has_pll_wo())
 #ifdef CONFIG_SOC_AU1000_FREQUENCY
                 cpu_speed = CONFIG_SOC_AU1000_FREQUENCY;
 #else
@@ -221,7 +221,7 @@ void __init plat_time_init(void)
 
         est_freq += 5000;    /* round */
         est_freq -= est_freq%10000;
-        printk(KERN_INFO "CPU frequency %u.%02u MHz\n",
+        printk(KERN_INFO "(PRId %08x) @ %u.%02u MHz\n", read_c0_prid(),
                est_freq / 1000000, ((est_freq % 1000000) * 100) / 1000000);
         set_au1x00_speed(est_freq);