1 files changed, 22 insertions, 9 deletions

diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index 31ab80f1befa..6850a29defcd 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -15,7 +15,6 @@
 
 #include <asm/sni.h>
 #include <asm/time.h>
-#include <asm/ds1216.h>
 
 #define PORT(_base,_irq)                                \
         {                                               \
@@ -40,20 +39,34 @@ static struct platform_device a20r_serial8250_device = {
         },
 };
 
+static struct resource a20r_ds1216_rsrc[] = {
+        {
+                .start = 0x1c081ffc,
+                .end   = 0x1c081fff,
+                .flags = IORESOURCE_MEM
+        }
+};
+
+static struct platform_device a20r_ds1216_device = {
+        .name           = "rtc-ds1216",
+        .num_resources  = ARRAY_SIZE(a20r_ds1216_rsrc),
+        .resource       = a20r_ds1216_rsrc
+};
+
 static struct resource snirm_82596_rsrc[] = {
         {
-                .start = 0xb8000000,
-                .end   = 0xb8000004,
+                .start = 0x18000000,
+                .end   = 0x18000004,
                 .flags = IORESOURCE_MEM
         },
         {
-                .start = 0xb8010000,
-                .end   = 0xb8010004,
+                .start = 0x18010000,
+                .end   = 0x18010004,
                 .flags = IORESOURCE_MEM
         },
         {
-                .start = 0xbff00000,
-                .end   = 0xbff00020,
+                .start = 0x1ff00000,
+                .end   = 0x1ff00020,
                 .flags = IORESOURCE_MEM
         },
         {
@@ -205,8 +218,7 @@ void __init sni_a20r_irq_init(void)
 
 void sni_a20r_init(void)
 {
-        ds1216_base = (volatile unsigned char *) SNI_DS1216_A20R_BASE;
-        rtc_mips_get_time = ds1216_get_cmos_time;
+        /* FIXME, remove if not needed */
 }
 
 static int __init snirm_a20r_setup_devinit(void)
@@ -218,6 +230,7 @@ static int __init snirm_a20r_setup_devinit(void)
                 platform_device_register(&snirm_53c710_pdev);
                 platform_device_register(&sc26xx_pdev);
                 platform_device_register(&a20r_serial8250_device);
+                platform_device_register(&a20r_ds1216_device);
                 break;
         }