[MIPS] SNI RM updates

- use RTC_CLASS instead of GEN_RTC
- get rid of ds1216 in favour of a RTC_CLASS driver
- use correct console device for older RM400
- use physical addresses for 82596 device
- use 128 byte L1 cache line size (this is needed because most of the
  SNI caches are using 128 L2 cache lines)

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 22 insertions, 10 deletions

diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
index b82ff129f5ea..4bfda020fdc7 100644
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
@@ -15,7 +15,6 @@
 
 #include <asm/sni.h>
 #include <asm/time.h>
-#include <asm/ds1216.h>
 #include <asm/irq_cpu.h>
 
 #define PORT(_base,_irq)                                \
@@ -41,20 +40,34 @@ static struct platform_device rm200_serial8250_device = {
         },
 };
 
+static struct resource rm200_ds1216_rsrc[] = {
+        {
+                .start = 0x1cd41ffc,
+                .end   = 0x1cd41fff,
+                .flags = IORESOURCE_MEM
+        }
+};
+
+static struct platform_device rm200_ds1216_device = {
+        .name           = "rtc-ds1216",
+        .num_resources  = ARRAY_SIZE(rm200_ds1216_rsrc),
+        .resource       = rm200_ds1216_rsrc
+};
+
 static struct resource snirm_82596_rm200_rsrc[] = {
         {
-                .start = 0xb8000000,
-                .end   = 0xb80fffff,
+                .start = 0x18000000,
+                .end   = 0x180fffff,
                 .flags = IORESOURCE_MEM
         },
         {
-                .start = 0xbb000000,
-                .end   = 0xbb000004,
+                .start = 0x1b000000,
+                .end   = 0x1b000004,
                 .flags = IORESOURCE_MEM
         },
         {
-                .start = 0xbff00000,
-                .end   = 0xbff00020,
+                .start = 0x1ff00000,
+                .end   = 0x1ff00020,
                 .flags = IORESOURCE_MEM
         },
         {
@@ -96,6 +109,7 @@ static int __init snirm_setup_devinit(void)
 {
         if (sni_brd_type == SNI_BRD_RM200) {
                 platform_device_register(&rm200_serial8250_device);
+                platform_device_register(&rm200_ds1216_device);
                 platform_device_register(&snirm_82596_rm200_pdev);
                 platform_device_register(&snirm_53c710_rm200_pdev);
         }
@@ -176,11 +190,9 @@ void __init sni_rm200_irq_init(void)
         setup_irq (SNI_RM200_INT_START + 0, &sni_isa_irq);
 }
 
-void sni_rm200_init(void)
+void __init sni_rm200_init(void)
 {
         set_io_port_base(SNI_PORT_BASE + 0x02000000);
         ioport_resource.end += 0x02000000;
-        ds1216_base = (volatile unsigned char *) SNI_DS1216_RM200_BASE;
-        rtc_mips_get_time = ds1216_get_cmos_time;
         board_time_init = sni_cpu_time_init;
 }