Merge commit 'origin/master'

[pandora-kernel.git] / arch / powerpc / platforms / maple / time.c

diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 15846cc..53bca13 100644 (file)
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc64/kernel/maple_time.c
- *
  *  (c) Copyright 2004 Benjamin Herrenschmidt (benh@kernel.crashing.org),
  *                     IBM Corp. 
  *
@@ -13,7 +11,6 @@
 
 #undef DEBUG
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -44,8 +41,6 @@
 #define DBG(x...)
 #endif
 
-extern void GregorianDay(struct rtc_time * tm);
-
 static int maple_rtc_addr;
 
 static int maple_clock_read(int addr)
@@ -62,34 +57,14 @@ static void maple_clock_write(unsigned long val, int addr)
 
 void maple_get_rtc_time(struct rtc_time *tm)
 {
-       int uip, i;
-
-       /* The Linux interpretation of the CMOS clock register contents:
-        * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
-        * RTC registers show the second which has precisely just started.
-        * Let's hope other operating systems interpret the RTC the same way.
-        */
-
-       /* Since the UIP flag is set for about 2.2 ms and the clock
-        * is typically written with a precision of 1 jiffy, trying
-        * to obtain a precision better than a few milliseconds is
-        * an illusion. Only consistency is interesting, this also
-        * allows to use the routine for /dev/rtc without a potential
-        * 1 second kernel busy loop triggered by any reader of /dev/rtc.
-        */
-
-       for (i = 0; i<1000000; i++) {
-               uip = maple_clock_read(RTC_FREQ_SELECT);
+       do {
                tm->tm_sec = maple_clock_read(RTC_SECONDS);
                tm->tm_min = maple_clock_read(RTC_MINUTES);
                tm->tm_hour = maple_clock_read(RTC_HOURS);
                tm->tm_mday = maple_clock_read(RTC_DAY_OF_MONTH);
                tm->tm_mon = maple_clock_read(RTC_MONTH);
                tm->tm_year = maple_clock_read(RTC_YEAR);
-               uip |= maple_clock_read(RTC_FREQ_SELECT);
-               if ((uip & RTC_UIP)==0)
-                       break;
-       }
+       } while (tm->tm_sec != maple_clock_read(RTC_SECONDS));
 
        if (!(maple_clock_read(RTC_CONTROL) & RTC_DM_BINARY)
            || RTC_ALWAYS_BCD) {
@@ -168,11 +143,24 @@ unsigned long __init maple_get_boot_time(void)
        struct rtc_time tm;
        struct device_node *rtcs;
 
-       rtcs = find_compatible_devices("rtc", "pnpPNP,b00");
-       if (rtcs && rtcs->addrs) {
-               maple_rtc_addr = rtcs->addrs[0].address;
-               printk(KERN_INFO "Maple: Found RTC at 0x%x\n", maple_rtc_addr);
-       } else {
+       rtcs = of_find_compatible_node(NULL, "rtc", "pnpPNP,b00");
+       if (rtcs) {
+               struct resource r;
+               if (of_address_to_resource(rtcs, 0, &r)) {
+                       printk(KERN_EMERG "Maple: Unable to translate RTC"
+                              " address\n");
+                       goto bail;
+               }
+               if (!(r.flags & IORESOURCE_IO)) {
+                       printk(KERN_EMERG "Maple: RTC address isn't PIO!\n");
+                       goto bail;
+               }
+               maple_rtc_addr = r.start;
+               printk(KERN_INFO "Maple: Found RTC at IO 0x%x\n",
+                      maple_rtc_addr);
+       }
+ bail:
+       if (maple_rtc_addr == 0) {
                maple_rtc_addr = RTC_PORT(0); /* legacy address */
                printk(KERN_INFO "Maple: No device node for RTC, assuming "
                       "legacy address (0x%x)\n", maple_rtc_addr);