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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] MTX1: clear PCI errors
  [MIPS] MTX1: add idsel cardbus ressources
  [MIPS] MTX1: remove unneeded settings
  [MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.
  [MIPS] Cobalt: update reserved resources
  [MIPS] SN: PCI fixup needs to include <irq.h>.
  [MIPS] DMA: Fix a bunch of warnings due to missing inline keywords.
  [MIPS] RM: It should be #ifdef CONFIG_FOO not #if CONFIG_FOO ...
  [MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
  [MIPS] DEC: Remove redeclarations of mips_machgroup and mips_machtype.
  [MIPS] No need to write c0_compare in plat_timer_setup
  [MIPS] Convert to RTC-class ds1742 driver
  [MIPS] Oprofile: Add missing break statements.
  [MIPS] jmr3927: build fix
  [MIPS] SNI: Fix mc146818_decode_year
  [MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.
  [MIPS] Replace sys32_socketcall with the generic compat_sys_socketcall.
  [MIPS] N32 waitid is the same as o32.

1 files changed, 24 insertions, 27 deletions

diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 415ff8710b55..88d34f11385a 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -79,37 +79,38 @@ static struct resource cobalt_io_resource = {
         .flags  = IORESOURCE_IO
 };
 
-static struct resource cobalt_io_resources[] = {
-        {
+/*
+ * Cobalt doesn't have PS/2 keyboard/mouse interfaces,
+ * keyboard conntroller is never used.
+ * Also PCI-ISA bridge DMA contoroller is never used.
+ */
+static struct resource cobalt_reserved_resources[] = {
+        {       /* dma1 */
                 .start  = 0x00,
                 .end    = 0x1f,
-                .name   = "dma1",
-                .flags  = IORESOURCE_BUSY
-        }, {
-                .start  = 0x40,
-                .end    = 0x5f,
-                .name   = "timer",
-                .flags  = IORESOURCE_BUSY
-        }, {
+                .name   = "reserved",
+                .flags  = IORESOURCE_BUSY | IORESOURCE_IO,
+        },
+        {       /* keyboard */
                 .start  = 0x60,
                 .end    = 0x6f,
-                .name   = "keyboard",
-                .flags  = IORESOURCE_BUSY
-        }, {
+                .name   = "reserved",
+                .flags  = IORESOURCE_BUSY | IORESOURCE_IO,
+        },
+        {       /* dma page reg */
                 .start  = 0x80,
                 .end    = 0x8f,
-                .name   = "dma page reg",
-                .flags  = IORESOURCE_BUSY
-        }, {
+                .name   = "reserved",
+                .flags  = IORESOURCE_BUSY | IORESOURCE_IO,
+        },
+        {       /* dma2 */
                 .start  = 0xc0,
                 .end    = 0xdf,
-                .name   = "dma2",
-                .flags  = IORESOURCE_BUSY
+                .name   = "reserved",
+                .flags  = IORESOURCE_BUSY | IORESOURCE_IO,
         },
 };
 
-#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))
-
 static struct pci_controller cobalt_pci_controller = {
         .pci_ops        = &gt64111_pci_ops,
         .mem_resource   = &cobalt_mem_resource,
@@ -133,9 +134,9 @@ void __init plat_mem_setup(void)
         /* I/O port resource must include LCD/buttons */
         ioport_resource.end = 0x0fffffff;
 
-        /* request I/O space for devices used on all i[345]86 PCs */
-        for (i = 0; i < COBALT_IO_RESOURCES; i++)
-                request_resource(&ioport_resource, cobalt_io_resources + i);
+        /* These resources have been reserved by VIA SuperI/O chip. */
+        for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)
+                request_resource(&ioport_resource, cobalt_reserved_resources + i);
 
         /* Read the cobalt id register out of the PCI config space */
         PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));
@@ -150,10 +151,6 @@ void __init plat_mem_setup(void)
 #endif
 
         if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
-#ifdef CONFIG_EARLY_PRINTK
-                cobalt_early_console();
-#endif
-
 #ifdef CONFIG_SERIAL_8250
                 uart.line       = 0;
                 uart.type       = PORT_UNKNOWN;