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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits)
  [MIPS] Pb1200/DBAu1200: move platform code to its proper place
  [MIPS] Fix handling of trap and breakpoint instructions
  [MIPS] Pb1200: do register SMC 91C111
  [MIPS] DBAu1200: fix bad SMC 91C111 resource size
  [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
  [MIPS] IP27: Fix build bug due to missing include
  [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
  [MIPS] cevt-gt641xx: Kill unnecessary include
  [MIPS] DS1287: Add clockevent driver
  [MIPS] add DECstation I/O ASIC clocksource
  [MIPS] rbtx4938: minor cleanup
  [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
  [MIPS] rbtx4938: misc cleanups
  [MIPS] jmr3927: use generic txx9 gpio
  [MIPS] rbhma4500: use generic txx9 gpio
  [MIPS] generic txx9 gpio support
  [MIPS] make fallback gpio.h gpiolib-friendly
  [MIPS] unexport null_perf_irq() and make it static
  [MIPS] unexport rtc_mips_set_time()
  [MIPS] unexport copy_from_user_page()
  ...

5 files changed, 9 insertions, 110 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 296b9c674bae..e0cf5e2dbab7 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -359,7 +359,7 @@ static void auide_ddma_rx_callback(int irq, void *param)
 static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 devwidth, u32 flags)
 {
         dev->dev_id          = dev_id;
-        dev->dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
+        dev->dev_physaddr    = (u32)IDE_PHYS_ADDR;
         dev->dev_intlevel    = 0;
         dev->dev_intpolarity = 0;
         dev->dev_tsize       = tsize;
@@ -397,7 +397,7 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
         dbdev_tab_t source_dev_tab, target_dev_tab;
         u32 dev_id, tsize, devwidth, flags;
 
-        dev_id   = AU1XXX_ATA_DDMA_REQ;
+        dev_id   = IDE_DDMA_REQ;
 
         tsize    =  8; /*  1 */
         devwidth = 32; /* 16 */
@@ -506,10 +506,10 @@ static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif)
 
         /* FIXME? */
         for (i = 0; i < 8; i++)
-                *ata_regs++ = ahwif->regbase + (i << AU1XXX_ATA_REG_OFFSET);
+                *ata_regs++ = ahwif->regbase + (i << IDE_REG_SHIFT);
 
         /* set the Alternative Status register */
-        *ata_regs = ahwif->regbase + (14 << AU1XXX_ATA_REG_OFFSET);
+        *ata_regs = ahwif->regbase + (14 << IDE_REG_SHIFT);
 }
 
 static const struct ide_port_ops au1xxx_port_ops = {
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8082c1d142df..f90a86ba7e2f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -469,7 +469,7 @@ config SNI_82596
 
 config KORINA
         tristate "Korina (IDT RC32434) Ethernet support"
-        depends on NET_ETHERNET && MIKROTIK_RB500
+        depends on NET_ETHERNET && MIKROTIK_RB532
         help
           If you have a Mikrotik RouterBoard 500 or IDT RC32434
           based system say Y. Otherwise say N.
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c
deleted file mode 100644
index 58015fd14be9..000000000000
--- a/drivers/serial/8250_au1x00.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Serial Device Initialisation for Au1x00
- *
- * (C) Copyright Embedded Alley Solutions, Inc 2005
- * Author: Pantelis Antoniou <pantelis@embeddedalley.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-#include <linux/serial_core.h>
-#include <linux/signal.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-
-#include <linux/serial_8250.h>
-
-#include <asm/mach-au1x00/au1000.h>
-
-#include "8250.h"
-
-#define PORT(_base, _irq)                               \
-        {                                               \
-                .iobase         = _base,                \
-                .membase        = (void __iomem *)_base,\
-                .mapbase        = CPHYSADDR(_base),     \
-                .irq            = _irq,                 \
-                .uartclk        = 0,    /* filled */    \
-                .regshift       = 2,                    \
-                .iotype         = UPIO_AU,              \
-                .flags          = UPF_SKIP_TEST         \
-        }
-
-static struct plat_serial8250_port au1x00_data[] = {
-#if defined(CONFIG_SOC_AU1000)
-        PORT(UART0_ADDR, AU1000_UART0_INT),
-        PORT(UART1_ADDR, AU1000_UART1_INT),
-        PORT(UART2_ADDR, AU1000_UART2_INT),
-        PORT(UART3_ADDR, AU1000_UART3_INT),
-#elif defined(CONFIG_SOC_AU1500)
-        PORT(UART0_ADDR, AU1500_UART0_INT),
-        PORT(UART3_ADDR, AU1500_UART3_INT),
-#elif defined(CONFIG_SOC_AU1100)
-        PORT(UART0_ADDR, AU1100_UART0_INT),
-        PORT(UART1_ADDR, AU1100_UART1_INT),
-        /* The internal UART2 does not exist on the AU1100 processor. */
-        PORT(UART3_ADDR, AU1100_UART3_INT),
-#elif defined(CONFIG_SOC_AU1550)
-        PORT(UART0_ADDR, AU1550_UART0_INT),
-        PORT(UART1_ADDR, AU1550_UART1_INT),
-        PORT(UART3_ADDR, AU1550_UART3_INT),
-#elif defined(CONFIG_SOC_AU1200)
-        PORT(UART0_ADDR, AU1200_UART0_INT),
-        PORT(UART1_ADDR, AU1200_UART1_INT),
-#endif
-        { },
-};
-
-static struct platform_device au1x00_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_AU1X00,
-        .dev                    = {
-                .platform_data  = au1x00_data,
-        },
-};
-
-static int __init au1x00_init(void)
-{
-        int i;
-        unsigned int uartclk;
-
-        /* get uart clock */
-        uartclk = get_au1x00_uart_baud_base() * 16;
-
-        /* fill up uartclk */
-        for (i = 0; au1x00_data[i].flags ; i++)
-                au1x00_data[i].uartclk = uartclk;
-
-        return platform_device_register(&au1x00_device);
-}
-
-/* XXX: Yes, I know this doesn't yet work. */
-static void __exit au1x00_exit(void)
-{
-        platform_device_unregister(&au1x00_device);
-}
-
-module_init(au1x00_init);
-module_exit(au1x00_exit);
-
-MODULE_AUTHOR("Pantelis Antoniou <pantelis@embeddedalley.com>");
-MODULE_DESCRIPTION("8250 serial probe module for Au1x000 cards");
-MODULE_LICENSE("GPL");
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index f7cd9504d811..34b809e3b596 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -262,12 +262,12 @@ config SERIAL_8250_ACORN
           cards.  If unsure, say N.
 
 config SERIAL_8250_AU1X00
-        bool "AU1X00 serial port support"
+        bool "Au1x00 serial port support"
         depends on SERIAL_8250 != n && SOC_AU1X00
         help
-          If you have an Au1x00 board and want to use the serial port, say Y
-          to this option.  The driver can handle 1 or 2 serial ports.
-          If unsure, say N.
+          If you have an Au1x00 SOC based board and want to use the serial port,
+          say Y to this option. The driver can handle up to 4 serial ports,
+          depending on the SOC. If unsure, say N.
 
 config SERIAL_8250_RM9K
         bool "Support for MIPS RM9xxx integrated serial port"
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 3cbea5494724..f02ff9fad017 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
 obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
 obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
 obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
-obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o