1 files changed, 64 insertions, 318 deletions

diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 0762f5db1924..62c1d94cb434 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -23,22 +23,24 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/time.h>
+#include <linux/rtc.h>
+#include <linux/rtc/m48t59.h>
 #include <linux/timex.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/profile.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 
 #include <asm/oplib.h>
 #include <asm/timer.h>
-#include <asm/mostek.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/idprom.h>
 #include <asm/machines.h>
-#include <asm/sun4paddr.h>
 #include <asm/page.h>
 #include <asm/pcic.h>
 #include <asm/irq_regs.h>
@@ -46,34 +48,9 @@
 #include "irq.h"
 
 DEFINE_SPINLOCK(rtc_lock);
-static enum sparc_clock_type sp_clock_typ;
-DEFINE_SPINLOCK(mostek_lock);
-void __iomem *mstk48t02_regs = NULL;
-static struct mostek48t08 __iomem *mstk48t08_regs = NULL;
 static int set_rtc_mmss(unsigned long);
 static int sbus_do_settimeofday(struct timespec *tv);
 
-#ifdef CONFIG_SUN4
-struct intersil *intersil_clock;
-#define intersil_cmd(intersil_reg, intsil_cmd) intersil_reg->int_cmd_reg = \
-        (intsil_cmd)
-
-#define intersil_intr(intersil_reg, intsil_cmd) intersil_reg->int_intr_reg = \
-        (intsil_cmd)
-
-#define intersil_start(intersil_reg) intersil_cmd(intersil_reg, \
-        ( INTERSIL_START | INTERSIL_32K | INTERSIL_NORMAL | INTERSIL_24H |\
-          INTERSIL_INTR_ENABLE))
-
-#define intersil_stop(intersil_reg) intersil_cmd(intersil_reg, \
-        ( INTERSIL_STOP | INTERSIL_32K | INTERSIL_NORMAL | INTERSIL_24H |\
-          INTERSIL_INTR_ENABLE))
-
-#define intersil_read_intr(intersil_reg, towhere) towhere = \
-        intersil_reg->int_intr_reg
-
-#endif
-
 unsigned long profile_pc(struct pt_regs *regs)
 {
         extern char __copy_user_begin[], __copy_user_end[];
@@ -96,7 +73,6 @@ unsigned long profile_pc(struct pt_regs *regs)
 EXPORT_SYMBOL(profile_pc);
 
 __volatile__ unsigned int *master_l10_counter;
-__volatile__ unsigned int *master_l10_limit;
 
 /*
  * timer_interrupt() needs to keep up the real-time clock,
@@ -116,15 +92,7 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id)
 
         /* Protect counter clear so that do_gettimeoffset works */
         write_seqlock(&xtime_lock);
-#ifdef CONFIG_SUN4
-        if((idprom->id_machtype == (SM_SUN4 | SM_4_260)) ||
-           (idprom->id_machtype == (SM_SUN4 | SM_4_110))) {
-                int temp;
-                intersil_read_intr(intersil_clock, temp);
-                /* re-enable the irq */
-                enable_pil_irq(10);
-        }
-#endif
+
         clear_clock_irq();
 
         do_timer(1);
@@ -147,157 +115,56 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id)
         return IRQ_HANDLED;
 }
 
-/* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */
-static void __devinit kick_start_clock(void)
+static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
 {
-        struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;
-        unsigned char sec;
-        int i, count;
-
-        prom_printf("CLOCK: Clock was stopped. Kick start ");
-
-        spin_lock_irq(&mostek_lock);
-
-        /* Turn on the kick start bit to start the oscillator. */
-        regs->creg |= MSTK_CREG_WRITE;
-        regs->sec &= ~MSTK_STOP;
-        regs->hour |= MSTK_KICK_START;
-        regs->creg &= ~MSTK_CREG_WRITE;
-
-        spin_unlock_irq(&mostek_lock);
-
-        /* Delay to allow the clock oscillator to start. */
-        sec = MSTK_REG_SEC(regs);
-        for (i = 0; i < 3; i++) {
-                while (sec == MSTK_REG_SEC(regs))
-                        for (count = 0; count < 100000; count++)
-                                /* nothing */ ;
-                prom_printf(".");
-                sec = regs->sec;
-        }
-        prom_printf("\n");
-
-        spin_lock_irq(&mostek_lock);
-
-        /* Turn off kick start and set a "valid" time and date. */
-        regs->creg |= MSTK_CREG_WRITE;
-        regs->hour &= ~MSTK_KICK_START;
-        MSTK_SET_REG_SEC(regs,0);
-        MSTK_SET_REG_MIN(regs,0);
-        MSTK_SET_REG_HOUR(regs,0);
-        MSTK_SET_REG_DOW(regs,5);
-        MSTK_SET_REG_DOM(regs,1);
-        MSTK_SET_REG_MONTH(regs,8);
-        MSTK_SET_REG_YEAR(regs,1996 - MSTK_YEAR_ZERO);
-        regs->creg &= ~MSTK_CREG_WRITE;
-
-        spin_unlock_irq(&mostek_lock);
-
-        /* Ensure the kick start bit is off. If it isn't, turn it off. */
-        while (regs->hour & MSTK_KICK_START) {
-                prom_printf("CLOCK: Kick start still on!\n");
-
-                spin_lock_irq(&mostek_lock);
-                regs->creg |= MSTK_CREG_WRITE;
-                regs->hour &= ~MSTK_KICK_START;
-                regs->creg &= ~MSTK_CREG_WRITE;
-                spin_unlock_irq(&mostek_lock);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct m48t59_plat_data *pdata = pdev->dev.platform_data;
+        void __iomem *regs = pdata->ioaddr;
+        unsigned char val = readb(regs + ofs);
+
+        /* the year 0 is 1968 */
+        if (ofs == pdata->offset + M48T59_YEAR) {
+                val += 0x68;
+                if ((val & 0xf) > 9)
+                        val += 6;
         }
-
-        prom_printf("CLOCK: Kick start procedure successful.\n");
-}
-
-/* Return nonzero if the clock chip battery is low. */
-static inline int has_low_battery(void)
-{
-        struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;
-        unsigned char data1, data2;
-
-        spin_lock_irq(&mostek_lock);
-        data1 = regs->eeprom[0];        /* Read some data. */
-        regs->eeprom[0] = ~data1;       /* Write back the complement. */
-        data2 = regs->eeprom[0];        /* Read back the complement. */
-        regs->eeprom[0] = data1;        /* Restore the original value. */
-        spin_unlock_irq(&mostek_lock);
-
-        return (data1 == data2);        /* Was the write blocked? */
+        return val;
 }
 
-static void __devinit mostek_set_system_time(void)
+static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)
 {
-        unsigned int year, mon, day, hour, min, sec;
-        struct mostek48t02 *mregs;
-
-        mregs = (struct mostek48t02 *)mstk48t02_regs;
-        if(!mregs) {
-                prom_printf("Something wrong, clock regs not mapped yet.\n");
-                prom_halt();
-        }               
-        spin_lock_irq(&mostek_lock);
-        mregs->creg |= MSTK_CREG_READ;
-        sec = MSTK_REG_SEC(mregs);
-        min = MSTK_REG_MIN(mregs);
-        hour = MSTK_REG_HOUR(mregs);
-        day = MSTK_REG_DOM(mregs);
-        mon = MSTK_REG_MONTH(mregs);
-        year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) );
-        xtime.tv_sec = mktime(year, mon, day, hour, min, sec);
-        xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
-        set_normalized_timespec(&wall_to_monotonic,
-                                -xtime.tv_sec, -xtime.tv_nsec);
-        mregs->creg &= ~MSTK_CREG_READ;
-        spin_unlock_irq(&mostek_lock);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct m48t59_plat_data *pdata = pdev->dev.platform_data;
+        void __iomem *regs = pdata->ioaddr;
+
+        if (ofs == pdata->offset + M48T59_YEAR) {
+                if (val < 0x68)
+                        val += 0x32;
+                else
+                        val -= 0x68;
+                if ((val & 0xf) > 9)
+                        val += 6;
+                if ((val & 0xf0) > 0x9A)
+                        val += 0x60;
+        }
+        writeb(val, regs + ofs);
 }
 
-/* Probe for the real time clock chip on Sun4 */
-static inline void sun4_clock_probe(void)
-{
-#ifdef CONFIG_SUN4
-        int temp;
-        struct resource r;
-
-        memset(&r, 0, sizeof(r));
-        if( idprom->id_machtype == (SM_SUN4 | SM_4_330) ) {
-                sp_clock_typ = MSTK48T02;
-                r.start = sun4_clock_physaddr;
-                mstk48t02_regs = sbus_ioremap(&r, 0,
-                                       sizeof(struct mostek48t02), NULL);
-                mstk48t08_regs = NULL;  /* To catch weirdness */
-                intersil_clock = NULL;  /* just in case */
-
-                /* Kick start the clock if it is completely stopped. */
-                if (mostek_read(mstk48t02_regs + MOSTEK_SEC) & MSTK_STOP)
-                        kick_start_clock();
-        } else if( idprom->id_machtype == (SM_SUN4 | SM_4_260)) {
-                /* intersil setup code */
-                printk("Clock: INTERSIL at %8x ",sun4_clock_physaddr);
-                sp_clock_typ = INTERSIL;
-                r.start = sun4_clock_physaddr;
-                intersil_clock = (struct intersil *) 
-                    sbus_ioremap(&r, 0, sizeof(*intersil_clock), "intersil");
-                mstk48t02_regs = 0;  /* just be sure */
-                mstk48t08_regs = NULL;  /* ditto */
-                /* initialise the clock */
-
-                intersil_intr(intersil_clock,INTERSIL_INT_100HZ);
-
-                intersil_start(intersil_clock);
-
-                intersil_read_intr(intersil_clock, temp);
-                while (!(temp & 0x80))
-                        intersil_read_intr(intersil_clock, temp);
-
-                intersil_read_intr(intersil_clock, temp);
-                while (!(temp & 0x80))
-                        intersil_read_intr(intersil_clock, temp);
-
-                intersil_stop(intersil_clock);
+static struct m48t59_plat_data m48t59_data = {
+        .read_byte = mostek_read_byte,
+        .write_byte = mostek_write_byte,
+};
 
-        }
-#endif
-}
+/* resource is set at runtime */
+static struct platform_device m48t59_rtc = {
+        .name           = "rtc-m48t59",
+        .id             = 0,
+        .num_resources  = 1,
+        .dev    = {
+                .platform_data = &m48t59_data,
+        },
+};
 
-#ifndef CONFIG_SUN4
 static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match)
 {
         struct device_node *dp = op->node;
@@ -306,38 +173,26 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
         if (!model)
                 return -ENODEV;
 
+        m48t59_rtc.resource = &op->resource[0];
         if (!strcmp(model, "mk48t02")) {
-                sp_clock_typ = MSTK48T02;
-
                 /* Map the clock register io area read-only */
-                mstk48t02_regs = of_ioremap(&op->resource[0], 0,
-                                            sizeof(struct mostek48t02),
-                                            "mk48t02");
-                mstk48t08_regs = NULL;  /* To catch weirdness */
+                m48t59_data.ioaddr = of_ioremap(&op->resource[0], 0,
+                                                2048, "rtc-m48t59");
+                m48t59_data.type = M48T59RTC_TYPE_M48T02;
         } else if (!strcmp(model, "mk48t08")) {
-                sp_clock_typ = MSTK48T08;
-                mstk48t08_regs = of_ioremap(&op->resource[0], 0,
-                                            sizeof(struct mostek48t08),
-                                            "mk48t08");
-
-                mstk48t02_regs = &mstk48t08_regs->regs;
+                m48t59_data.ioaddr = of_ioremap(&op->resource[0], 0,
+                                                8192, "rtc-m48t59");
+                m48t59_data.type = M48T59RTC_TYPE_M48T08;
         } else
                 return -ENODEV;
 
-        /* Report a low battery voltage condition. */
-        if (has_low_battery())
-                printk(KERN_CRIT "NVRAM: Low battery voltage!\n");
-
-        /* Kick start the clock if it is completely stopped. */
-        if (mostek_read(mstk48t02_regs + MOSTEK_SEC) & MSTK_STOP)
-                kick_start_clock();
-
-        mostek_set_system_time();
+        if (platform_device_register(&m48t59_rtc) < 0)
+                printk(KERN_ERR "Registering RTC device failed\n");
 
         return 0;
 }
 
-static struct of_device_id clock_match[] = {
+static struct of_device_id __initdata clock_match[] = {
         {
                 .name = "eeprom",
         },
@@ -348,7 +203,7 @@ static struct of_platform_driver clock_driver = {
         .match_table    = clock_match,
         .probe          = clock_probe,
         .driver         = {
-                .name   = "clock",
+                .name   = "rtc",
         },
 };
 
@@ -364,7 +219,6 @@ static int __init clock_init(void)
  * need to see the clock registers.
  */
 fs_initcall(clock_init);
-#endif /* !CONFIG_SUN4 */
 
 static void __init sbus_time_init(void)
 {
@@ -372,51 +226,8 @@ static void __init sbus_time_init(void)
         BTFIXUPSET_CALL(bus_do_settimeofday, sbus_do_settimeofday, BTFIXUPCALL_NORM);
         btfixup();
 
-        if (ARCH_SUN4)
-                sun4_clock_probe();
-
         sparc_init_timers(timer_interrupt);
         
-#ifdef CONFIG_SUN4
-        if(idprom->id_machtype == (SM_SUN4 | SM_4_330)) {
-                mostek_set_system_time();
-        } else if(idprom->id_machtype == (SM_SUN4 | SM_4_260) ) {
-                /* initialise the intersil on sun4 */
-                unsigned int year, mon, day, hour, min, sec;
-                int temp;
-                struct intersil *iregs;
-
-                iregs=intersil_clock;
-                if(!iregs) {
-                        prom_printf("Something wrong, clock regs not mapped yet.\n");
-                        prom_halt();
-                }
-
-                intersil_intr(intersil_clock,INTERSIL_INT_100HZ);
-                disable_pil_irq(10);
-                intersil_stop(iregs);
-                intersil_read_intr(intersil_clock, temp);
-
-                temp = iregs->clk.int_csec;
-
-                sec = iregs->clk.int_sec;
-                min = iregs->clk.int_min;
-                hour = iregs->clk.int_hour;
-                day = iregs->clk.int_day;
-                mon = iregs->clk.int_month;
-                year = MSTK_CVT_YEAR(iregs->clk.int_year);
-
-                enable_pil_irq(10);
-                intersil_start(iregs);
-
-                xtime.tv_sec = mktime(year, mon, day, hour, min, sec);
-                xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
-                set_normalized_timespec(&wall_to_monotonic,
-                                       -xtime.tv_sec, -xtime.tv_nsec);
-                printk("%u/%u/%u %u:%u:%u\n",day,mon,year,hour,min,sec);
-        }
-#endif
-
         /* Now that OBP ticker has been silenced, it is safe to enable IRQ. */
         local_irq_enable();
 }
@@ -522,80 +333,15 @@ static int sbus_do_settimeofday(struct timespec *tv)
         return 0;
 }
 
-/*
- * BUG: This routine does not handle hour overflow properly; it just
- *      sets the minutes. Usually you won't notice until after reboot!
- */
-static int set_rtc_mmss(unsigned long nowtime)
+static int set_rtc_mmss(unsigned long secs)
 {
-        int real_seconds, real_minutes, mostek_minutes;
-        struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;
-        unsigned long flags;
-#ifdef CONFIG_SUN4
-        struct intersil *iregs = intersil_clock;
-        int temp;
-#endif
+        struct rtc_device *rtc = rtc_class_open("rtc0");
+        int err = -1;
 
-        /* Not having a register set can lead to trouble. */
-        if (!regs) {
-#ifdef CONFIG_SUN4
-                if(!iregs)
-                return -1;
-                else {
-                        temp = iregs->clk.int_csec;
-
-                        mostek_minutes = iregs->clk.int_min;
-
-                        real_seconds = nowtime % 60;
-                        real_minutes = nowtime / 60;
-                        if (((abs(real_minutes - mostek_minutes) + 15)/30) & 1)
-                                real_minutes += 30;     /* correct for half hour time zone */
-                        real_minutes %= 60;
-
-                        if (abs(real_minutes - mostek_minutes) < 30) {
-                                intersil_stop(iregs);
-                                iregs->clk.int_sec=real_seconds;
-                                iregs->clk.int_min=real_minutes;
-                                intersil_start(iregs);
-                        } else {
-                                printk(KERN_WARNING
-                               "set_rtc_mmss: can't update from %d to %d\n",
-                                       mostek_minutes, real_minutes);
-                                return -1;
-                        }
-                        
-                        return 0;
-                }
-#endif
+        if (rtc) {
+                err = rtc_set_mmss(rtc, secs);
+                rtc_class_close(rtc);
         }
 
-        spin_lock_irqsave(&mostek_lock, flags);
-        /* Read the current RTC minutes. */
-        regs->creg |= MSTK_CREG_READ;
-        mostek_minutes = MSTK_REG_MIN(regs);
-        regs->creg &= ~MSTK_CREG_READ;
-
-        /*
-         * since we're only adjusting minutes and seconds,
-         * don't interfere with hour overflow. This avoids
-         * messing with unknown time zones but requires your
-         * RTC not to be off by more than 15 minutes
-         */
-        real_seconds = nowtime % 60;
-        real_minutes = nowtime / 60;
-        if (((abs(real_minutes - mostek_minutes) + 15)/30) & 1)
-                real_minutes += 30;     /* correct for half hour time zone */
-        real_minutes %= 60;
-
-        if (abs(real_minutes - mostek_minutes) < 30) {
-                regs->creg |= MSTK_CREG_WRITE;
-                MSTK_SET_REG_SEC(regs,real_seconds);
-                MSTK_SET_REG_MIN(regs,real_minutes);
-                regs->creg &= ~MSTK_CREG_WRITE;
-                spin_unlock_irqrestore(&mostek_lock, flags);
-                return 0;
-        } else {
-                spin_unlock_irqrestore(&mostek_lock, flags);
-                return -1;
-        }
+        return err;
 }