[PATCH] mips: jazz updates

Get the Jazz platform back to build and mostly working.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index bbea2cc124e17189dc45d54cf2d4c092293bc917..5a19b531f27cd7666c01cdc2c08e4cf334817934 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -29,6 +29,10 @@ menu "Machine selection"
 
 config MACH_JAZZ
        bool "Support for the Jazz family of machines"
+       select ARC
+       select ARC32
+       select GENERIC_ISA_DMA
+       select I8259
        select ISA
        help
         This a family of machines based on the MIPS R4030 chipset which was

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index f714954650189a5bf55f66b25c8b6b584aad0866..0b608fa98d5a26fdeae339f0519d5aab4a9c0882 100644 (file)
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -17,7 +17,7 @@
 
 extern asmlinkage void jazz_handle_int(void);
 
-static spinlock_t r4030_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(r4030_lock);
 
 static void enable_r4030_irq(unsigned int irq)
 {

diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index 79ac935e53d73bcbbc94b6386533eab8a5273ae2..46e421e143486ae0742199d8950f3e94ea12c21d 100644 (file)
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -29,7 +29,7 @@
 
 static unsigned long vdma_pagetable_start;
 
-static spinlock_t vdma_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(vdma_lock);
 
 /*
  * Debug stuff

diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index 6f2b509124a125967c04f385d9a4fd5af94fa9b2..500112b7b93d5a1e6c697419ebffa8629615daa9 100644 (file)
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -15,7 +15,7 @@
  * Arch-dependent inline functions and defines.
  */
 
-#if defined(CONFIG_MIPS_JAZZ)
+#if defined(CONFIG_MACH_JAZZ)
 #include "i8042-jazzio.h"
 #elif defined(CONFIG_SGI_IP22)
 #include "i8042-ip22io.h"

diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index f0d21ae735efeceff9fbc419ab899576afd4d2f3..a642f736cf852364d4baea31b92b511ae82394a3 100644 (file)
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -52,6 +52,40 @@ static volatile unsigned char cmd_buffer[16];
                                 * via PIO.
                                 */
 
+int jazz_esp_detect(Scsi_Host_Template *tpnt);
+static int jazz_esp_release(struct Scsi_Host *shost)
+{
+       if (shost->irq)
+               free_irq(shost->irq, NULL);
+       if (shost->dma_channel != 0xff)
+               free_dma(shost->dma_channel);
+       if (shost->io_port && shost->n_io_port)
+               release_region(shost->io_port, shost->n_io_port);
+       scsi_unregister(shost);
+       return 0;
+}
+
+static Scsi_Host_Template driver_template = {
+       .proc_name              = "jazz_esp",
+       .proc_info              = &esp_proc_info,
+       .name                   = "ESP 100/100a/200",
+       .detect                 = jazz_esp_detect,
+       .slave_alloc            = esp_slave_alloc,
+       .slave_destroy          = esp_slave_destroy,
+       .release                = jazz_esp_release,
+       .info                   = esp_info,
+       .queuecommand           = esp_queue,
+       .eh_abort_handler       = esp_abort,
+       .eh_bus_reset_handler   = esp_reset,
+       .can_queue              = 7,
+       .this_id                = 7,
+       .sg_tablesize           = SG_ALL,
+       .cmd_per_lun            = 1,
+       .use_clustering         = DISABLE_CLUSTERING,
+};
+
+#include "scsi_module.c"
+
 /***************************************************************** Detection */
 static int jazz_esp_detect(struct scsi_host_template *tpnt)
 {
@@ -140,18 +174,6 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
     return 0;
 }
 
-static int jazz_esp_release(struct Scsi_Host *shost)
-{
-       if (shost->irq)
-               free_irq(shost->irq, NULL);
-       if (shost->dma_channel != 0xff)
-               free_dma(shost->dma_channel);
-       if (shost->io_port && shost->n_io_port)
-               release_region(shost->io_port, shost->n_io_port);
-       scsi_unregister(shost);
-       return 0;
-}
-
 /************************************************************* DMA Functions */
 static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count)
 {

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2d4ba236bddbdeb1a51fd569ee34f379b071d267..eaa557bce18582b008bd22527f08936f0af155b9 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1053,6 +1053,13 @@ config FB_TX3912
 
          Say Y here to enable kernel support for the on-board framebuffer.
 
+config FB_G364
+       bool
+       depends on MIPS_MAGNUM_4000 || OLIVETTI_M700
+       help
+         The G364 driver is the framebuffer used in MIPS Magnum 4000 and
+         Olivetti M700-10 systems.
+
 config FB_68328
        bool "Motorola 68328 native frame buffer support"
        depends on (M68328 || M68EZ328 || M68VZ328)

diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index 5eed5bd38a1d2a748c035fc243fb8b09b6f82e9a..605d1a13202098542f9c72f873adc8a0f70c22a7 100644 (file)
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/console.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>