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] Rename PC speaker code
  [MIPS] Don't use genrtc.
  [MIPS] Remove unused time.c for swarm
  [MIPS] Sparse: Use NULL for pointer
  [MIPS] Fix a sparse warning in arch/mips/pci/pci.c
  [MIPS] SMTC: Interrupt mask backstop hack
  [MIPS] separate platform_device registration for VR41xx RTC
  [MIPS] Separate platform_device registration for VR41xx GPIO
  [MIPS] MIPSsim: Fix build.
  [MIPS] separate platform_device registration for VR41xx serial interface
  [MIPS] Include cacheflush.h in uncache.c
  [MIPS] Cleanup tlbdebug.h
  [MIPS] Change names of local variables to silence sparse (part 2)
  [MIPS] Workaround for a sparse warning in include/asm-mips/io.h
  [MIPS] RM: Use only phyiscal address for 82596 and 53c710
  [MIPS] Hydrogen3: Remove remaining bits of code.
  [MIPS] DEC: Fix modpost warning.
  Revert "[MIPS] DEC: Fix modpost warning."
  [MIPS] Fix resume for 64K page size on R4000 class processors.

5 files changed, 148 insertions, 337 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ef683ebd367c..a31c6d2c061f 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -815,7 +815,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 && !SUPERH
+        depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index 0cea8d4907df..e5ed09192be8 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -19,18 +19,17 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/platform_device.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
-#include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/vr41xx/giu.h>
 #include <asm/vr41xx/irq.h>
@@ -44,18 +43,6 @@ static int major;	/* default is dynamic major device number */
 module_param(major, int, 0);
 MODULE_PARM_DESC(major, "Major device number");
 
-#define GIU_TYPE1_START         0x0b000100UL
-#define GIU_TYPE1_SIZE          0x20UL
-
-#define GIU_TYPE2_START         0x0f000140UL
-#define GIU_TYPE2_SIZE          0x20UL
-
-#define GIU_TYPE3_START         0x0f000140UL
-#define GIU_TYPE3_SIZE          0x28UL
-
-#define GIU_PULLUPDOWN_START    0x0b0002e0UL
-#define GIU_PULLUPDOWN_SIZE     0x04UL
-
 #define GIUIOSELL       0x00
 #define GIUIOSELH       0x02
 #define GIUPIODL        0x04
@@ -89,8 +76,6 @@ MODULE_PARM_DESC(major, "Major device number");
 #define GPIO_HAS_INTERRUPT_EDGE_SELECT  0x0100
 
 static spinlock_t giu_lock;
-static struct resource *giu_resource1;
-static struct resource *giu_resource2;
 static unsigned long giu_flags;
 static unsigned int giu_nr_pins;
 
@@ -234,7 +219,7 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_
                                 giu_set(GIUINTHTSELL, mask);
                         else
                                 giu_clear(GIUINTHTSELL, mask);
-                        if (current_cpu_data.cputype == CPU_VR4133) {
+                        if (giu_flags & GPIO_HAS_INTERRUPT_EDGE_SELECT) {
                                 switch (trigger) {
                                 case IRQ_TRIGGER_EDGE_FALLING:
                                         giu_set(GIUFEDGEINHL, mask);
@@ -269,7 +254,7 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_
                                 giu_set(GIUINTHTSELH, mask);
                         else
                                 giu_clear(GIUINTHTSELH, mask);
-                        if (current_cpu_data.cputype == CPU_VR4133) {
+                        if (giu_flags & GPIO_HAS_INTERRUPT_EDGE_SELECT) {
                                 switch (trigger) {
                                 case IRQ_TRIGGER_EDGE_FALLING:
                                         giu_set(GIUFEDGEINHH, mask);
@@ -298,7 +283,6 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_
                 giu_write(GIUINTSTATH, mask);
         }
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_set_irq_trigger);
 
 void vr41xx_set_irq_level(unsigned int pin, irq_level_t level)
@@ -321,7 +305,6 @@ void vr41xx_set_irq_level(unsigned int pin, irq_level_t level)
                 giu_write(GIUINTSTATH, mask);
         }
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_set_irq_level);
 
 gpio_data_t vr41xx_gpio_get_pin(unsigned int pin)
@@ -350,7 +333,6 @@ gpio_data_t vr41xx_gpio_get_pin(unsigned int pin)
 
         return GPIO_DATA_LOW;
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_gpio_get_pin);
 
 int vr41xx_gpio_set_pin(unsigned int pin, gpio_data_t data)
@@ -388,7 +370,6 @@ int vr41xx_gpio_set_pin(unsigned int pin, gpio_data_t data)
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_gpio_set_pin);
 
 int vr41xx_gpio_set_direction(unsigned int pin, gpio_direction_t dir)
@@ -438,7 +419,6 @@ int vr41xx_gpio_set_direction(unsigned int pin, gpio_direction_t dir)
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_gpio_set_direction);
 
 int vr41xx_gpio_pullupdown(unsigned int pin, gpio_pull_t pull)
@@ -477,7 +457,6 @@ int vr41xx_gpio_pullupdown(unsigned int pin, gpio_pull_t pull)
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_gpio_pullupdown);
 
 static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
@@ -596,61 +575,40 @@ static const struct file_operations gpio_fops = {
 
 static int __devinit giu_probe(struct platform_device *dev)
 {
-        unsigned long start, size, flags = 0;
-        unsigned int nr_pins = 0, trigger, i, pin;
-        struct resource *res1, *res2 = NULL;
-        void *base;
+        struct resource *res;
+        unsigned int trigger, i, pin;
         struct irq_chip *chip;
-        int retval;
-
-        switch (current_cpu_data.cputype) {
-        case CPU_VR4111:
-        case CPU_VR4121:
-                start = GIU_TYPE1_START;
-                size = GIU_TYPE1_SIZE;
-                flags = GPIO_HAS_PULLUPDOWN_IO;
-                nr_pins = 50;
+        int irq, retval;
+
+        switch (dev->id) {
+        case GPIO_50PINS_PULLUPDOWN:
+                giu_flags = GPIO_HAS_PULLUPDOWN_IO;
+                giu_nr_pins = 50;
                 break;
-        case CPU_VR4122:
-        case CPU_VR4131:
-                start = GIU_TYPE2_START;
-                size = GIU_TYPE2_SIZE;
-                nr_pins = 36;
+        case GPIO_36PINS:
+                giu_nr_pins = 36;
                 break;
-        case CPU_VR4133:
-                start = GIU_TYPE3_START;
-                size = GIU_TYPE3_SIZE;
-                flags = GPIO_HAS_INTERRUPT_EDGE_SELECT;
-                nr_pins = 48;
+        case GPIO_48PINS_EDGE_SELECT:
+                giu_flags = GPIO_HAS_INTERRUPT_EDGE_SELECT;
+                giu_nr_pins = 48;
                 break;
         default:
+                printk(KERN_ERR "GIU: unknown ID %d\n", dev->id);
                 return -ENODEV;
         }
 
-        res1 = request_mem_region(start, size, "GIU");
-        if (res1 == NULL)
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (!res)
                 return -EBUSY;
 
-        base = ioremap(start, size);
-        if (base == NULL) {
-                release_resource(res1);
+        giu_base = ioremap(res->start, res->end - res->start + 1);
+        if (!giu_base)
                 return -ENOMEM;
-        }
-
-        if (flags & GPIO_HAS_PULLUPDOWN_IO) {
-                res2 = request_mem_region(GIU_PULLUPDOWN_START, GIU_PULLUPDOWN_SIZE, "GIU");
-                if (res2 == NULL) {
-                        iounmap(base);
-                        release_resource(res1);
-                        return -EBUSY;
-                }
-        }
 
         retval = register_chrdev(major, "GIU", &gpio_fops);
         if (retval < 0) {
-                iounmap(base);
-                release_resource(res1);
-                release_resource(res2);
+                iounmap(giu_base);
+                giu_base = NULL;
                 return retval;
         }
 
@@ -660,11 +618,6 @@ static int __devinit giu_probe(struct platform_device *dev)
         }
 
         spin_lock_init(&giu_lock);
-        giu_base = base;
-        giu_resource1 = res1;
-        giu_resource2 = res2;
-        giu_flags = flags;
-        giu_nr_pins = nr_pins;
 
         giu_write(GIUINTENL, 0);
         giu_write(GIUINTENH, 0);
@@ -685,22 +638,23 @@ static int __devinit giu_probe(struct platform_device *dev)
 
         }
 
-        return cascade_irq(GIUINT_IRQ, giu_get_irq);
+        irq = platform_get_irq(dev, 0);
+        if (irq < 0 || irq >= NR_IRQS)
+                return -EBUSY;
+
+        return cascade_irq(irq, giu_get_irq);
 }
 
 static int __devexit giu_remove(struct platform_device *dev)
 {
-        iounmap(giu_base);
-
-        release_resource(giu_resource1);
-        if (giu_flags & GPIO_HAS_PULLUPDOWN_IO)
-                release_resource(giu_resource2);
+        if (giu_base) {
+                iounmap(giu_base);
+                giu_base = NULL;
+        }
 
         return 0;
 }
 
-static struct platform_device *giu_platform_device;
-
 static struct platform_driver giu_device_driver = {
         .probe          = giu_probe,
         .remove         = __devexit_p(giu_remove),
@@ -712,30 +666,12 @@ static struct platform_driver giu_device_driver = {
 
 static int __init vr41xx_giu_init(void)
 {
-        int retval;
-
-        giu_platform_device = platform_device_alloc("GIU", -1);
-        if (!giu_platform_device)
-                return -ENOMEM;
-
-        retval = platform_device_add(giu_platform_device);
-        if (retval < 0) {
-                platform_device_put(giu_platform_device);
-                return retval;
-        }
-
-        retval = platform_driver_register(&giu_device_driver);
-        if (retval < 0)
-                platform_device_unregister(giu_platform_device);
-
-        return retval;
+        return platform_driver_register(&giu_device_driver);
 }
 
 static void __exit vr41xx_giu_exit(void)
 {
         platform_driver_unregister(&giu_device_driver);
-
-        platform_device_unregister(giu_platform_device);
 }
 
 module_init(vr41xx_giu_init);
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index af7596ef29e2..ce2f78de7a80 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -17,10 +17,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
@@ -30,25 +31,11 @@
 #include <asm/div64.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/vr41xx/irq.h>
 
 MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
 MODULE_DESCRIPTION("NEC VR4100 series RTC driver");
 MODULE_LICENSE("GPL");
 
-#define RTC1_TYPE1_START        0x0b0000c0UL
-#define RTC1_TYPE1_END          0x0b0000dfUL
-#define RTC2_TYPE1_START        0x0b0001c0UL
-#define RTC2_TYPE1_END          0x0b0001dfUL
-
-#define RTC1_TYPE2_START        0x0f000100UL
-#define RTC1_TYPE2_END          0x0f00011fUL
-#define RTC2_TYPE2_START        0x0f000120UL
-#define RTC2_TYPE2_END          0x0f00013fUL
-
-#define RTC1_SIZE               0x20
-#define RTC2_SIZE               0x20
-
 /* RTC 1 registers */
 #define ETIMELREG               0x00
 #define ETIMEMREG               0x02
@@ -98,13 +85,8 @@ static char rtc_name[] = "RTC";
 static unsigned long periodic_frequency;
 static unsigned long periodic_count;
 static unsigned int alarm_enabled;
-
-struct resource rtc_resource[2] = {
-        {       .name   = rtc_name,
-                .flags  = IORESOURCE_MEM,       },
-        {       .name   = rtc_name,
-                .flags  = IORESOURCE_MEM,       },
-};
+static int aie_irq = -1;
+static int pie_irq = -1;
 
 static inline unsigned long read_elapsed_second(void)
 {
@@ -150,8 +132,8 @@ static void vr41xx_rtc_release(struct device *dev)
 
         spin_unlock_irq(&rtc_lock);
 
-        disable_irq(ELAPSEDTIME_IRQ);
-        disable_irq(RTCLONG1_IRQ);
+        disable_irq(aie_irq);
+        disable_irq(pie_irq);
 }
 
 static int vr41xx_rtc_read_time(struct device *dev, struct rtc_time *time)
@@ -209,14 +191,14 @@ static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
         spin_lock_irq(&rtc_lock);
 
         if (alarm_enabled)
-                disable_irq(ELAPSEDTIME_IRQ);
+                disable_irq(aie_irq);
 
         rtc1_write(ECMPLREG, (uint16_t)(alarm_sec << 15));
         rtc1_write(ECMPMREG, (uint16_t)(alarm_sec >> 1));
         rtc1_write(ECMPHREG, (uint16_t)(alarm_sec >> 17));
 
         if (wkalrm->enabled)
-                enable_irq(ELAPSEDTIME_IRQ);
+                enable_irq(aie_irq);
 
         alarm_enabled = wkalrm->enabled;
 
@@ -234,7 +216,7 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
                 spin_lock_irq(&rtc_lock);
 
                 if (!alarm_enabled) {
-                        enable_irq(ELAPSEDTIME_IRQ);
+                        enable_irq(aie_irq);
                         alarm_enabled = 1;
                 }
 
@@ -244,17 +226,17 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
                 spin_lock_irq(&rtc_lock);
 
                 if (alarm_enabled) {
-                        disable_irq(ELAPSEDTIME_IRQ);
+                        disable_irq(aie_irq);
                         alarm_enabled = 0;
                 }
 
                 spin_unlock_irq(&rtc_lock);
                 break;
         case RTC_PIE_ON:
-                enable_irq(RTCLONG1_IRQ);
+                enable_irq(pie_irq);
                 break;
         case RTC_PIE_OFF:
-                disable_irq(RTCLONG1_IRQ);
+                disable_irq(pie_irq);
                 break;
         case RTC_IRQP_READ:
                 return put_user(periodic_frequency, (unsigned long __user *)arg);
@@ -331,31 +313,37 @@ static const struct rtc_class_ops vr41xx_rtc_ops = {
 
 static int __devinit rtc_probe(struct platform_device *pdev)
 {
+        struct resource *res;
         struct rtc_device *rtc;
-        unsigned int irq;
         int retval;
 
-        if (pdev->num_resources != 2)
+        if (pdev->num_resources != 4)
                 return -EBUSY;
 
-        rtc1_base = ioremap(pdev->resource[0].start, RTC1_SIZE);
-        if (rtc1_base == NULL)
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
                 return -EBUSY;
 
-        rtc2_base = ioremap(pdev->resource[1].start, RTC2_SIZE);
-        if (rtc2_base == NULL) {
-                iounmap(rtc1_base);
-                rtc1_base = NULL;
+        rtc1_base = ioremap(res->start, res->end - res->start + 1);
+        if (!rtc1_base)
                 return -EBUSY;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!res) {
+                retval = -EBUSY;
+                goto err_rtc1_iounmap;
+        }
+
+        rtc2_base = ioremap(res->start, res->end - res->start + 1);
+        if (!rtc2_base) {
+                retval = -EBUSY;
+                goto err_rtc1_iounmap;
         }
 
         rtc = rtc_device_register(rtc_name, &pdev->dev, &vr41xx_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
-                iounmap(rtc1_base);
-                iounmap(rtc2_base);
-                rtc1_base = NULL;
-                rtc2_base = NULL;
-                return PTR_ERR(rtc);
+                retval = PTR_ERR(rtc);
+                goto err_iounmap_all;
         }
 
         spin_lock_irq(&rtc_lock);
@@ -368,35 +356,50 @@ static int __devinit rtc_probe(struct platform_device *pdev)
 
         spin_unlock_irq(&rtc_lock);
 
-        irq = ELAPSEDTIME_IRQ;
-        retval = request_irq(irq, elapsedtime_interrupt, IRQF_DISABLED,
-                             "elapsed_time", pdev);
-        if (retval == 0) {
-                irq = RTCLONG1_IRQ;
-                retval = request_irq(irq, rtclong1_interrupt, IRQF_DISABLED,
-                                     "rtclong1", pdev);
+        aie_irq = platform_get_irq(pdev, 0);
+        if (aie_irq < 0 || aie_irq >= NR_IRQS) {
+                retval = -EBUSY;
+                goto err_device_unregister;
         }
 
-        if (retval < 0) {
-                printk(KERN_ERR "rtc: IRQ%d is busy\n", irq);
-                rtc_device_unregister(rtc);
-                if (irq == RTCLONG1_IRQ)
-                        free_irq(ELAPSEDTIME_IRQ, NULL);
-                iounmap(rtc1_base);
-                iounmap(rtc2_base);
-                rtc1_base = NULL;
-                rtc2_base = NULL;
-                return retval;
-        }
+        retval = request_irq(aie_irq, elapsedtime_interrupt, IRQF_DISABLED,
+                             "elapsed_time", pdev);
+        if (retval < 0)
+                goto err_device_unregister;
+
+        pie_irq = platform_get_irq(pdev, 1);
+        if (pie_irq < 0 || pie_irq >= NR_IRQS)
+                goto err_free_irq;
+
+        retval = request_irq(pie_irq, rtclong1_interrupt, IRQF_DISABLED,
+                             "rtclong1", pdev);
+        if (retval < 0)
+                goto err_free_irq;
 
         platform_set_drvdata(pdev, rtc);
 
-        disable_irq(ELAPSEDTIME_IRQ);
-        disable_irq(RTCLONG1_IRQ);
+        disable_irq(aie_irq);
+        disable_irq(pie_irq);
 
         printk(KERN_INFO "rtc: Real Time Clock of NEC VR4100 series\n");
 
         return 0;
+
+err_free_irq:
+        free_irq(aie_irq, pdev);
+
+err_device_unregister:
+        rtc_device_unregister(rtc);
+
+err_iounmap_all:
+        iounmap(rtc2_base);
+        rtc2_base = NULL;
+
+err_rtc1_iounmap:
+        iounmap(rtc1_base);
+        rtc1_base = NULL;
+
+        return retval;
 }
 
 static int __devexit rtc_remove(struct platform_device *pdev)
@@ -404,23 +407,21 @@ static int __devexit rtc_remove(struct platform_device *pdev)
         struct rtc_device *rtc;
 
         rtc = platform_get_drvdata(pdev);
-        if (rtc != NULL)
+        if (rtc)
                 rtc_device_unregister(rtc);
 
         platform_set_drvdata(pdev, NULL);
 
-        free_irq(ELAPSEDTIME_IRQ, NULL);
-        free_irq(RTCLONG1_IRQ, NULL);
-        if (rtc1_base != NULL)
+        free_irq(aie_irq, pdev);
+        free_irq(pie_irq, pdev);
+        if (rtc1_base)
                 iounmap(rtc1_base);
-        if (rtc2_base != NULL)
+        if (rtc2_base)
                 iounmap(rtc2_base);
 
         return 0;
 }
 
-static struct platform_device *rtc_platform_device;
-
 static struct platform_driver rtc_platform_driver = {
         .probe          = rtc_probe,
         .remove         = __devexit_p(rtc_remove),
@@ -432,55 +433,12 @@ static struct platform_driver rtc_platform_driver = {
 
 static int __init vr41xx_rtc_init(void)
 {
-        int retval;
-
-        switch (current_cpu_data.cputype) {
-        case CPU_VR4111:
-        case CPU_VR4121:
-                rtc_resource[0].start = RTC1_TYPE1_START;
-                rtc_resource[0].end = RTC1_TYPE1_END;
-                rtc_resource[1].start = RTC2_TYPE1_START;
-                rtc_resource[1].end = RTC2_TYPE1_END;
-                break;
-        case CPU_VR4122:
-        case CPU_VR4131:
-        case CPU_VR4133:
-                rtc_resource[0].start = RTC1_TYPE2_START;
-                rtc_resource[0].end = RTC1_TYPE2_END;
-                rtc_resource[1].start = RTC2_TYPE2_START;
-                rtc_resource[1].end = RTC2_TYPE2_END;
-                break;
-        default:
-                return -ENODEV;
-                break;
-        }
-
-        rtc_platform_device = platform_device_alloc("RTC", -1);
-        if (rtc_platform_device == NULL)
-                return -ENOMEM;
-
-        retval = platform_device_add_resources(rtc_platform_device,
-                                rtc_resource, ARRAY_SIZE(rtc_resource));
-
-        if (retval == 0)
-                retval = platform_device_add(rtc_platform_device);
-
-        if (retval < 0) {
-                platform_device_put(rtc_platform_device);
-                return retval;
-        }
-
-        retval = platform_driver_register(&rtc_platform_driver);
-        if (retval < 0)
-                platform_device_unregister(rtc_platform_device);
-
-        return retval;
+        return platform_driver_register(&rtc_platform_driver);
 }
 
 static void __exit vr41xx_rtc_exit(void)
 {
         platform_driver_unregister(&rtc_platform_driver);
-        platform_device_unregister(rtc_platform_device);
 }
 
 module_init(vr41xx_rtc_init);
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index cf0e663b42ed..85309acb75f6 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for NEC VR4100 series Serial Interface Unit.
  *
- *  Copyright (C) 2004-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2004-2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  Based on drivers/serial/8250.c, by Russell King.
  *
@@ -25,12 +25,12 @@
 #endif
 
 #include <linux/console.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
-#include <linux/ioport.h>
+#include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/ioport.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/serial_reg.h>
@@ -38,11 +38,9 @@
 #include <linux/tty_flip.h>
 
 #include <asm/io.h>
-#include <asm/vr41xx/irq.h>
 #include <asm/vr41xx/siu.h>
 #include <asm/vr41xx/vr41xx.h>
 
-#define SIU_PORTS_MAX   2
 #define SIU_BAUD_BASE   1152000
 #define SIU_MAJOR       204
 #define SIU_MINOR_BASE  82
@@ -60,32 +58,13 @@
  #define IRUSESEL       0x02
  #define SIRSEL         0x01
 
-struct siu_port {
-        unsigned int type;
-        unsigned int irq;
-        unsigned long start;
-};
-
-static const struct siu_port siu_type1_ports[] = {
-        {       .type           = PORT_VR41XX_SIU,
-                .irq            = SIU_IRQ,
-                .start          = 0x0c000000UL,         },
-};
-
-#define SIU_TYPE1_NR_PORTS      (sizeof(siu_type1_ports) / sizeof(struct siu_port))
-
-static const struct siu_port siu_type2_ports[] = {
-        {       .type           = PORT_VR41XX_SIU,
-                .irq            = SIU_IRQ,
-                .start          = 0x0f000800UL,         },
-        {       .type           = PORT_VR41XX_DSIU,
-                .irq            = DSIU_IRQ,
-                .start          = 0x0f000820UL,         },
+static struct uart_port siu_uart_ports[SIU_PORTS_MAX] = {
+        [0 ... SIU_PORTS_MAX-1] = {
+                .lock   = __SPIN_LOCK_UNLOCKED(siu_uart_ports->lock),
+                .irq    = -1,
+        },
 };
 
-#define SIU_TYPE2_NR_PORTS      (sizeof(siu_type2_ports) / sizeof(struct siu_port))
-
-static struct uart_port siu_uart_ports[SIU_PORTS_MAX];
 static uint8_t lsr_break_flag[SIU_PORTS_MAX];
 
 #define siu_read(port, offset)          readb((port)->membase + (offset))
@@ -110,7 +89,6 @@ void vr41xx_select_siu_interface(siu_interface_t interface)
 
         spin_unlock_irqrestore(&port->lock, flags);
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_select_siu_interface);
 
 void vr41xx_use_irda(irda_use_t use)
@@ -132,7 +110,6 @@ void vr41xx_use_irda(irda_use_t use)
 
         spin_unlock_irqrestore(&port->lock, flags);
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_use_irda);
 
 void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed)
@@ -166,7 +143,6 @@ void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed)
 
         spin_unlock_irqrestore(&port->lock, flags);
 }
-
 EXPORT_SYMBOL_GPL(vr41xx_select_irda_module);
 
 static inline void siu_clear_fifo(struct uart_port *port)
@@ -177,21 +153,6 @@ static inline void siu_clear_fifo(struct uart_port *port)
         siu_write(port, UART_FCR, 0);
 }
 
-static inline int siu_probe_ports(void)
-{
-        switch (current_cpu_data.cputype) {
-        case CPU_VR4111:
-        case CPU_VR4121:
-                return SIU_TYPE1_NR_PORTS;
-        case CPU_VR4122:
-        case CPU_VR4131:
-        case CPU_VR4133:
-                return SIU_TYPE2_NR_PORTS;
-        }
-
-        return 0;
-}
-
 static inline unsigned long siu_port_size(struct uart_port *port)
 {
         switch (port->type) {
@@ -206,21 +167,10 @@ static inline unsigned long siu_port_size(struct uart_port *port)
 
 static inline unsigned int siu_check_type(struct uart_port *port)
 {
-        switch (current_cpu_data.cputype) {
-        case CPU_VR4111:
-        case CPU_VR4121:
-                if (port->line == 0)
-                        return PORT_VR41XX_SIU;
-                break;
-        case CPU_VR4122:
-        case CPU_VR4131:
-        case CPU_VR4133:
-                if (port->line == 0)
-                        return PORT_VR41XX_SIU;
-                else if (port->line == 1)
-                        return PORT_VR41XX_DSIU;
-                break;
-        }
+        if (port->line == 0)
+                return PORT_VR41XX_SIU;
+        if (port->line == 1 && port->irq != -1)
+                return PORT_VR41XX_DSIU;
 
         return PORT_UNKNOWN;
 }
@@ -751,44 +701,34 @@ static struct uart_ops siu_uart_ops = {
         .verify_port    = siu_verify_port,
 };
 
-static int siu_init_ports(void)
+static int siu_init_ports(struct platform_device *pdev)
 {
-        const struct siu_port *siu;
         struct uart_port *port;
-        int i, num;
+        struct resource *res;
+        int *type = pdev->dev.platform_data;
+        int i;
 
-        switch (current_cpu_data.cputype) {
-        case CPU_VR4111:
-        case CPU_VR4121:
-                siu = siu_type1_ports;
-                break;
-        case CPU_VR4122:
-        case CPU_VR4131:
-        case CPU_VR4133:
-                siu = siu_type2_ports;
-                break;
-        default:
+        if (!type)
                 return 0;
-        }
 
         port = siu_uart_ports;
-        num = siu_probe_ports();
-        for (i = 0; i < num; i++) {
-                spin_lock_init(&port->lock);
-                port->irq = siu->irq;
+        for (i = 0; i < SIU_PORTS_MAX; i++) {
+                port->type = type[i];
+                if (port->type == PORT_UNKNOWN)
+                        continue;
+                port->irq = platform_get_irq(pdev, i);
                 port->uartclk = SIU_BAUD_BASE * 16;
                 port->fifosize = 16;
                 port->regshift = 0;
                 port->iotype = UPIO_MEM;
                 port->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
-                port->type = siu->type;
                 port->line = i;
-                port->mapbase = siu->start;
-                siu++;
+                res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+                port->mapbase = res->start;
                 port++;
         }
 
-        return num;
+        return i;
 }
 
 #ifdef CONFIG_SERIAL_VR41XX_CONSOLE
@@ -883,13 +823,9 @@ static struct console siu_console = {
 static int __devinit siu_console_init(void)
 {
         struct uart_port *port;
-        int num, i;
-
-        num = siu_init_ports();
-        if (num <= 0)
-                return -ENODEV;
+        int i;
 
-        for (i = 0; i < num; i++) {
+        for (i = 0; i < SIU_PORTS_MAX; i++) {
                 port = &siu_uart_ports[i];
                 port->ops = &siu_uart_ops;
         }
@@ -920,7 +856,7 @@ static int __devinit siu_probe(struct platform_device *dev)
         struct uart_port *port;
         int num, i, retval;
 
-        num = siu_init_ports();
+        num = siu_init_ports(dev);
         if (num <= 0)
                 return -ENODEV;
 
@@ -998,8 +934,6 @@ static int siu_resume(struct platform_device *dev)
         return 0;
 }
 
-static struct platform_device *siu_platform_device;
-
 static struct platform_driver siu_device_driver = {
         .probe          = siu_probe,
         .remove         = __devexit_p(siu_remove),
@@ -1013,29 +947,12 @@ static struct platform_driver siu_device_driver = {
 
 static int __init vr41xx_siu_init(void)
 {
-        int retval;
-
-        siu_platform_device = platform_device_alloc("SIU", -1);
-        if (!siu_platform_device)
-                return -ENOMEM;
-
-        retval = platform_device_add(siu_platform_device);
-        if (retval < 0) {
-                platform_device_put(siu_platform_device);
-                return retval;
-        }
-
-        retval = platform_driver_register(&siu_device_driver);
-        if (retval < 0)
-                platform_device_unregister(siu_platform_device);
-
-        return retval;
+        return platform_driver_register(&siu_device_driver);
 }
 
 static void __exit vr41xx_siu_exit(void)
 {
         platform_driver_unregister(&siu_device_driver);
-        platform_device_unregister(siu_platform_device);
 }
 
 module_init(vr41xx_siu_init);
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 4fff61b32dcb..ed979f13908a 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -136,14 +136,14 @@ struct dec_serial *zs_chain;	/* list of all channels */
 struct tty_struct zs_ttys[NUM_CHANNELS];
 
 #ifdef CONFIG_SERIAL_DEC_CONSOLE
-static struct console sercons;
+static struct console zs_console;
 #endif
 #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
    !defined(MODULE)
 static unsigned long break_pressed; /* break, really ... */
 #endif
 
-static unsigned char zs_init_regs[16] = {
+static unsigned char zs_init_regs[16] __initdata = {
         0,                              /* write 0 */
         0,                              /* write 1 */
         0,                              /* write 2 */
@@ -383,7 +383,7 @@ static void receive_chars(struct dec_serial *info)
 
 #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
    !defined(MODULE)
-                if (break_pressed && info->line == sercons.index) {
+                if (break_pressed && info->line == zs_console.index) {
                         /* Ignore the null char got when BREAK is removed.  */
                         if (ch == 0)
                                 continue;
@@ -446,7 +446,7 @@ static void status_handle(struct dec_serial *info)
         if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) {
 #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
    !defined(MODULE)
-                if (info->line == sercons.index) {
+                if (info->line == zs_console.index) {
                         if (!break_pressed)
                                 break_pressed = jiffies;
                 } else
@@ -1557,9 +1557,9 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
         }
 
 #ifdef CONFIG_SERIAL_DEC_CONSOLE
-        if (sercons.cflag && sercons.index == line) {
-                tty->termios->c_cflag = sercons.cflag;
-                sercons.cflag = 0;
+        if (zs_console.cflag && zs_console.index == line) {
+                tty->termios->c_cflag = zs_console.cflag;
+                zs_console.cflag = 0;
                 change_speed(info);
         }
 #endif
@@ -1581,7 +1581,7 @@ static void __init show_serial_version(void)
 /*  Initialize Z8530s zs_channels
  */
 
-static void probe_sccs(void)
+static void __init probe_sccs(void)
 {
         struct dec_serial **pp;
         int i, n, n_chips = 0, n_channels, chip, channel;
@@ -1923,7 +1923,7 @@ static struct tty_driver *serial_console_device(struct console *c, int *index)
  *      - initialize the serial port
  *      Return non-zero if we didn't find a serial port.
  */
-static int serial_console_setup(struct console *co, char *options)
+static int __init serial_console_setup(struct console *co, char *options)
 {
         struct dec_serial *info;
         int baud = 9600;
@@ -2069,7 +2069,7 @@ static int serial_console_setup(struct console *co, char *options)
         return 0;
 }
 
-static struct console sercons = {
+static struct console zs_console = {
         .name           = "ttyS",
         .write          = serial_console_write,
         .device         = serial_console_device,
@@ -2083,7 +2083,7 @@ static struct console sercons = {
  */
 void __init zs_serial_console_init(void)
 {
-        register_console(&sercons);
+        register_console(&zs_console);
 }
 #endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */