Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (80 commits)
  [MIPS] tlbex.c: Cleanup __init usage.
  [MIPS] WRPPMC serial support move to platform device
  [MIPS] R1: Fix hazard barriers to make kernels work on R2 also.
  [MIPS] VPE: reimplement ELF loader.
  [MIPS] cleanup WRPPMC include files
  [MIPS] Add BUG_ON assertion for attempt to run kernel on the wrong CPU type.
  [MIPS] SMP: Use ISO C struct initializer for local structs.
  [MIPS] SMP: Kill useless casts.
  [MIPS] Kill num_online_cpus() loops.
  [MIPS] SMP: Implement smp_call_function_mask().
  [MIPS] Make facility to convert CPU types to strings generally available.
  [MIPS] Convert list of CPU types from #define to enum.
  [MIPS] Optimize get_unaligned / put_unaligned implementations.
  [MIPS] checkfiles: Fix "need space after that ','" errors.
  [MIPS] Fix "no space between function name and open parenthesis" warnings.
  [MIPS] Allow hardwiring of the CPU type to a single type for optimization.
  [MIPS] tlbex: Size optimize code by declaring a few functions inline.
  [MIPS] pg-r4k.c: Dump the generated code
  [MIPS] Cobalt: Remove cobalt_machine_power_off()
  [MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c
  ...

1 files changed, 121 insertions, 13 deletions

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 798279e06691..cfc7dce78dab 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -7,6 +7,7 @@
  *
  * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle
  * Copyright (C) 2001 MIPS Technologies, Inc.
+ * Copyright (C) 2007 by Thomas Bogendoerfer
  */
 #include <linux/eisa.h>
 #include <linux/hdreg.h>
@@ -20,8 +21,11 @@
 #include <linux/ide.h>
 #include <linux/pm.h>
 #include <linux/screen_info.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
 
 #include <asm/bootinfo.h>
+#include <asm/i8253.h>
 #include <asm/irq.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
@@ -30,18 +34,12 @@
 #include <asm/pgtable.h>
 #include <asm/time.h>
 #include <asm/traps.h>
+#include <asm/mc146818-time.h>
 
 extern asmlinkage void jazz_handle_int(void);
 
 extern void jazz_machine_restart(char *command);
 
-void __init plat_timer_setup(struct irqaction *irq)
-{
-        /* set the clock to 100 Hz */
-        r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
-        setup_irq(JAZZ_TIMER_IRQ, irq);
-}
-
 static struct resource jazz_io_resources[] = {
         {
                 .start  = 0x00,
@@ -66,18 +64,21 @@ static struct resource jazz_io_resources[] = {
         }
 };
 
+void __init plat_time_init(void)
+{
+        setup_pit_timer();
+}
+
 void __init plat_mem_setup(void)
 {
         int i;
 
         /* Map 0xe0000000 -> 0x0:800005C0, 0xe0010000 -> 0x1:30000580 */
-        add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K);
-
+        add_wired_entry(0x02000017, 0x03c00017, 0xe0000000, PM_64K);
         /* Map 0xe2000000 -> 0x0:900005C0, 0xe3010000 -> 0x0:910005C0 */
-        add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M);
-
+        add_wired_entry(0x02400017, 0x02440017, 0xe2000000, PM_16M);
         /* Map 0xe4000000 -> 0x0:600005C0, 0xe4100000 -> 400005C0 */
-        add_wired_entry (0x01800017, 0x01000017, 0xe4000000, PM_4M);
+        add_wired_entry(0x01800017, 0x01000017, 0xe4000000, PM_4M);
 
         set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
@@ -94,6 +95,7 @@ void __init plat_mem_setup(void)
 
         _machine_restart = jazz_machine_restart;
 
+#ifdef CONFIG_VT
         screen_info = (struct screen_info) {
                 0, 0,           /* orig-x, orig-y */
                 0,              /* unused */
@@ -105,6 +107,112 @@ void __init plat_mem_setup(void)
                 0,              /* orig_video_isVGA */
                 16              /* orig_video_points */
         };
+#endif
 
-        vdma_init();
+        add_preferred_console("ttyS", 0, "9600");
 }
+
+#ifdef CONFIG_OLIVETTI_M700
+#define UART_CLK  1843200
+#else
+/* Some Jazz machines seem to have an 8MHz crystal clock but I don't know
+   exactly which ones ... XXX */
+#define UART_CLK (8000000 / 16) /* ( 3072000 / 16) */
+#endif
+
+#define MEMPORT(_base, _irq)                            \
+        {                                               \
+                .mapbase        = (_base),              \
+                .membase        = (void *)(_base),      \
+                .irq            = (_irq),               \
+                .uartclk        = UART_CLK,             \
+                .iotype         = UPIO_MEM,             \
+                .flags          = UPF_BOOT_AUTOCONF,    \
+        }
+
+static struct plat_serial8250_port jazz_serial_data[] = {
+        MEMPORT(JAZZ_SERIAL1_BASE, JAZZ_SERIAL1_IRQ),
+        MEMPORT(JAZZ_SERIAL2_BASE, JAZZ_SERIAL2_IRQ),
+        { },
+};
+
+static struct platform_device jazz_serial8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = jazz_serial_data,
+        },
+};
+
+static struct resource jazz_esp_rsrc[] = {
+        {
+                .start = JAZZ_SCSI_BASE,
+                .end   = JAZZ_SCSI_BASE + 31,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .start = JAZZ_SCSI_DMA,
+                .end   = JAZZ_SCSI_DMA,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .start = JAZZ_SCSI_IRQ,
+                .end   = JAZZ_SCSI_IRQ,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device jazz_esp_pdev = {
+        .name           = "jazz_esp",
+        .num_resources  = ARRAY_SIZE(jazz_esp_rsrc),
+        .resource       = jazz_esp_rsrc
+};
+
+static struct resource jazz_sonic_rsrc[] = {
+        {
+                .start = JAZZ_ETHERNET_BASE,
+                .end   = JAZZ_ETHERNET_BASE + 0xff,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .start = JAZZ_ETHERNET_IRQ,
+                .end   = JAZZ_ETHERNET_IRQ,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device jazz_sonic_pdev = {
+        .name           = "jazzsonic",
+        .num_resources  = ARRAY_SIZE(jazz_sonic_rsrc),
+        .resource       = jazz_sonic_rsrc
+};
+
+static struct resource jazz_cmos_rsrc[] = {
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device jazz_cmos_pdev = {
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(jazz_cmos_rsrc),
+        .resource       = jazz_cmos_rsrc
+};
+
+static int __init jazz_setup_devinit(void)
+{
+        platform_device_register(&jazz_serial8250_device);
+        platform_device_register(&jazz_esp_pdev);
+        platform_device_register(&jazz_sonic_pdev);
+        platform_device_register(&jazz_cmos_pdev);
+        return 0;
+}
+
+device_initcall(jazz_setup_devinit);