1 files changed, 123 insertions, 87 deletions

diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index bc43a5c2224d..2cd8f5734b36 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -1,6 +1,7 @@
 /*
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
+ * Copyright (C) Dmitri Vorobiev
  *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
@@ -15,39 +16,57 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  */
+#include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/ioport.h>
+#include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/screen_info.h>
+#include <linux/time.h>
 
-#include <asm/cpu.h>
 #include <asm/bootinfo.h>
-#include <asm/irq.h>
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/mips-boards/malta.h>
 #include <asm/mips-boards/maltaint.h>
 #include <asm/dma.h>
-#include <asm/time.h>
 #include <asm/traps.h>
 #ifdef CONFIG_VT
 #include <linux/console.h>
 #endif
 
-extern void mips_reboot_setup(void);
-extern unsigned long mips_rtc_get_time(void);
-
-#ifdef CONFIG_KGDB
-extern void kgdb_config(void);
-#endif
-
 struct resource standard_io_resources[] = {
-        { .name = "dma1", .start = 0x00, .end = 0x1f, .flags = IORESOURCE_BUSY },
-        { .name = "timer", .start = 0x40, .end = 0x5f, .flags = IORESOURCE_BUSY },
-        { .name = "keyboard", .start = 0x60, .end = 0x6f, .flags = IORESOURCE_BUSY },
-        { .name = "dma page reg", .start = 0x80, .end = 0x8f, .flags = IORESOURCE_BUSY },
-        { .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },
+        {
+                .name = "dma1",
+                .start = 0x00,
+                .end = 0x1f,
+                .flags = IORESOURCE_BUSY
+        },
+        {
+                .name = "timer",
+                .start = 0x40,
+                .end = 0x5f,
+                .flags = IORESOURCE_BUSY
+        },
+        {
+                .name = "keyboard",
+                .start = 0x60,
+                .end = 0x6f,
+                .flags = IORESOURCE_BUSY
+        },
+        {
+                .name = "dma page reg",
+                .start = 0x80,
+                .end = 0x8f,
+                .flags = IORESOURCE_BUSY
+        },
+        {
+                .name = "dma2",
+                .start = 0xc0,
+                .end = 0xdf,
+                .flags = IORESOURCE_BUSY
+        },
 };
 
 const char *get_system_type(void)
@@ -62,7 +81,7 @@ const char display_string[] = "        LINUX ON MALTA       ";
 #endif /* CONFIG_MIPS_MT_SMTC */
 
 #ifdef CONFIG_BLK_DEV_FD
-void __init fd_activate(void)
+static void __init fd_activate(void)
 {
         /*
          * Activate Floppy Controller in the SMSC FDC37M817 Super I/O
@@ -83,6 +102,85 @@ void __init fd_activate(void)
 }
 #endif
 
+#ifdef CONFIG_BLK_DEV_IDE
+static void __init pci_clock_check(void)
+{
+        unsigned int __iomem *jmpr_p =
+                (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
+        int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;
+        static const int pciclocks[] __initdata = {
+                33, 20, 25, 30, 12, 16, 37, 10
+        };
+        int pciclock = pciclocks[jmpr];
+        char *argptr = prom_getcmdline();
+
+        if (pciclock != 33 && !strstr(argptr, "idebus=")) {
+                printk(KERN_WARNING "WARNING: PCI clock is %dMHz, "
+                                "setting idebus\n", pciclock);
+                argptr += strlen(argptr);
+                sprintf(argptr, " idebus=%d", pciclock);
+                if (pciclock < 20 || pciclock > 66)
+                        printk(KERN_WARNING "WARNING: IDE timing "
+                                        "calculations will be incorrect\n");
+        }
+}
+#endif
+
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
+static void __init screen_info_setup(void)
+{
+        screen_info = (struct screen_info) {
+                .orig_x = 0,
+                .orig_y = 25,
+                .ext_mem_k = 0,
+                .orig_video_page = 0,
+                .orig_video_mode = 0,
+                .orig_video_cols = 80,
+                .unused2 = 0,
+                .orig_video_ega_bx = 0,
+                .unused3 = 0,
+                .orig_video_lines = 25,
+                .orig_video_isVGA = VIDEO_TYPE_VGAC,
+                .orig_video_points = 16
+        };
+}
+#endif
+
+static void __init bonito_quirks_setup(void)
+{
+        char *argptr;
+
+        argptr = prom_getcmdline();
+        if (strstr(argptr, "debug")) {
+                BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE;
+                printk(KERN_INFO "Enabled Bonito debug mode\n");
+        } else
+                BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;
+
+#ifdef CONFIG_DMA_COHERENT
+        if (BONITO_PCICACHECTRL & BONITO_PCICACHECTRL_CPUCOH_PRES) {
+                BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_CPUCOH_EN;
+                printk(KERN_INFO "Enabled Bonito CPU coherency\n");
+
+                argptr = prom_getcmdline();
+                if (strstr(argptr, "iobcuncached")) {
+                        BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN;
+                        BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG &
+                                ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
+                                        BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
+                        printk(KERN_INFO "Disabled Bonito IOBC coherency\n");
+                } else {
+                        BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN;
+                        BONITO_PCIMEMBASECFG |=
+                                (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
+                                        BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
+                        printk(KERN_INFO "Enabled Bonito IOBC coherency\n");
+                }
+        } else
+                panic("Hardware DMA cache coherency not supported");
+#endif
+}
+
 void __init plat_mem_setup(void)
 {
         unsigned int i;
@@ -102,86 +200,24 @@ void __init plat_mem_setup(void)
         kgdb_config();
 #endif
 
-        if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) {
-                char *argptr;
-
-                argptr = prom_getcmdline();
-                if (strstr(argptr, "debug")) {
-                        BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE;
-                        printk("Enabled Bonito debug mode\n");
-                }
-                else
-                        BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;
-
-#ifdef CONFIG_DMA_COHERENT
-                if (BONITO_PCICACHECTRL & BONITO_PCICACHECTRL_CPUCOH_PRES) {
-                        BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_CPUCOH_EN;
-                        printk("Enabled Bonito CPU coherency\n");
-
-                        argptr = prom_getcmdline();
-                        if (strstr(argptr, "iobcuncached")) {
-                                BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN;
-                                BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG &
-                                        ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
-                                          BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
-                                printk("Disabled Bonito IOBC coherency\n");
-                        }
-                        else {
-                                BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN;
-                                BONITO_PCIMEMBASECFG |=
-                                        (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
-                                         BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
-                                printk("Enabled Bonito IOBC coherency\n");
-                        }
-                }
-                else
-                        panic("Hardware DMA cache coherency not supported");
-
-#endif
-        }
 #ifdef CONFIG_DMA_COHERENT
-        else {
+        if (mips_revision_sconid != MIPS_REVISION_SCON_BONITO)
                 panic("Hardware DMA cache coherency not supported");
-        }
 #endif
 
+        if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO)
+                bonito_quirks_setup();
+
 #ifdef CONFIG_BLK_DEV_IDE
-        /* Check PCI clock */
-        {
-                unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
-                int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;
-                static const int pciclocks[] __initdata = {
-                        33, 20, 25, 30, 12, 16, 37, 10
-                };
-                int pciclock = pciclocks[jmpr];
-                char *argptr = prom_getcmdline();
-
-                if (pciclock != 33 && !strstr (argptr, "idebus=")) {
-                        printk("WARNING: PCI clock is %dMHz, setting idebus\n", pciclock);
-                        argptr += strlen(argptr);
-                        sprintf(argptr, " idebus=%d", pciclock);
-                        if (pciclock < 20 || pciclock > 66)
-                                printk("WARNING: IDE timing calculations will be incorrect\n");
-                }
-        }
+        pci_clock_check();
 #endif
+
 #ifdef CONFIG_BLK_DEV_FD
         fd_activate();
 #endif
-#ifdef CONFIG_VT
-#if defined(CONFIG_VGA_CONSOLE)
-        screen_info = (struct screen_info) {
-                0, 25,                  /* orig-x, orig-y */
-                0,                      /* unused */
-                0,                      /* orig-video-page */
-                0,                      /* orig-video-mode */
-                80,                     /* orig-video-cols */
-                0, 0, 0,                /* ega_ax, ega_bx, ega_cx */
-                25,                     /* orig-video-lines */
-                VIDEO_TYPE_VGAC,        /* orig-video-isVGA */
-                16                      /* orig-video-points */
-        };
-#endif
+
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
+        screen_info_setup();
 #endif
         mips_reboot_setup();
 }