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

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile

1 files changed, 44 insertions, 19 deletions

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 93317b5b8740..a122d9287d16 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -25,14 +25,13 @@
 #include <asm/system.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/gio_device.h>
+
 #include <video/newport.h>
 
 #include <linux/linux_logo.h>
 #include <linux/font.h>
 
-
-extern unsigned long sgi_gfxaddr;
-
 #define FONT_DATA ((unsigned char *)font_vga_8x16.data)
 
 /* borrowed from fbcon.c */
@@ -304,12 +303,6 @@ static const char *newport_startup(void)
 {
         int i;
 
-        if (!sgi_gfxaddr)
-                return NULL;
-
-        if (!npregs)
-                npregs = (struct newport_regs *)/* ioremap cannot fail */
-                        ioremap(sgi_gfxaddr, sizeof(struct newport_regs));
         npregs->cset.config = NPORT_CFG_GD0;
 
         if (newport_wait(npregs))
@@ -743,26 +736,58 @@ const struct consw newport_con = {
         .con_save_screen  = DUMMY
 };
 
-#ifdef MODULE
-static int __init newport_console_init(void)
+static int newport_probe(struct gio_device *dev,
+                         const struct gio_device_id *id)
 {
-        if (!sgi_gfxaddr)
-                return 0;
+        unsigned long newport_addr;
 
-        if (!npregs)
-                npregs = (struct newport_regs *)/* ioremap cannot fail */
-                        ioremap(sgi_gfxaddr, sizeof(struct newport_regs));
+        if (!dev->resource.start)
+                return -EINVAL;
+
+        if (npregs)
+                return -EBUSY; /* we only support one Newport as console */
+
+        newport_addr = dev->resource.start + 0xF0000;
+        if (!request_mem_region(newport_addr, 0x10000, "Newport"))
+                return -ENODEV;
+
+        npregs = (struct newport_regs *)/* ioremap cannot fail */
+                ioremap(newport_addr, sizeof(struct newport_regs));
 
         return take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1);
 }
-module_init(newport_console_init);
 
-static void __exit newport_console_exit(void)
+static void newport_remove(struct gio_device *dev)
 {
         give_up_console(&newport_con);
         iounmap((void *)npregs);
 }
+
+static struct gio_device_id newport_ids[] = {
+        { .id = 0x7e },
+        { .id = 0xff }
+};
+
+MODULE_ALIAS("gio:7e");
+
+static struct gio_driver newport_driver = {
+        .name = "newport",
+        .id_table = newport_ids,
+        .probe = newport_probe,
+        .remove = newport_remove,
+};
+
+int __init newport_console_init(void)
+{
+        return gio_register_driver(&newport_driver);
+}
+
+void __exit newport_console_exit(void)
+{
+        gio_unregister_driver(&newport_driver);
+}
+
+module_init(newport_console_init);
 module_exit(newport_console_exit);
-#endif
 
 MODULE_LICENSE("GPL");