sh: dreamcast: rtc: push down rtc class ops into driver

[sfrench/cifs-2.6.git] / arch / sh / boards / mach-dreamcast / rtc.c

diff --git a/arch/sh/boards/mach-dreamcast/rtc.c b/arch/sh/boards/mach-dreamcast/rtc.c
index 061d65714fcc2782ab0dae15daec9e33223d43c3..0eb12c45fa597174d48bace5151b4b9fe5bfa9ce 100644 (file)
--- a/arch/sh/boards/mach-dreamcast/rtc.c
+++ b/arch/sh/boards/mach-dreamcast/rtc.c
@@ -11,8 +11,9 @@
  */
 
 #include <linux/time.h>
-#include <asm/rtc.h>
-#include <asm/io.h>
+#include <linux/rtc.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
 
 /* The AICA RTC has an Epoch of 1/1/1950, so we must subtract 20 years (in
    seconds) to get the standard Unix Epoch when getting the time, and add
@@ -26,13 +27,15 @@
 
 /**
  * aica_rtc_gettimeofday - Get the time from the AICA RTC
- * @ts: pointer to resulting timespec
+ * @dev: the RTC device (ignored)
+ * @tm: pointer to resulting RTC time structure
  *
  * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch.
  */
-static void aica_rtc_gettimeofday(struct timespec *ts)
+static int aica_rtc_gettimeofday(struct device *dev, struct rtc_time *tm)
 {
        unsigned long val1, val2;
+       time64_t t;
 
        do {
                val1 = ((__raw_readl(AICA_RTC_SECS_H) & 0xffff) << 16) |
@@ -42,22 +45,26 @@ static void aica_rtc_gettimeofday(struct timespec *ts)
                        (__raw_readl(AICA_RTC_SECS_L) & 0xffff);
        } while (val1 != val2);
 
-       ts->tv_sec = val1 - TWENTY_YEARS;
+       /* normalize to 1970..2106 time range */
+       t = (u32)(val1 - TWENTY_YEARS);
 
-       /* Can't get nanoseconds with just a seconds counter. */
-       ts->tv_nsec = 0;
+       rtc_time64_to_tm(t, tm);
+
+       return 0;
 }
 
 /**
  * aica_rtc_settimeofday - Set the AICA RTC to the current time
- * @secs: contains the time_t to set
+ * @dev: the RTC device (ignored)
+ * @tm: pointer to new RTC time structure
  *
  * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter.
  */
-static int aica_rtc_settimeofday(const time_t secs)
+static int aica_rtc_settimeofday(struct device *dev, struct rtc_time *tm)
 {
        unsigned long val1, val2;
-       unsigned long adj = secs + TWENTY_YEARS;
+       time64_t secs = rtc_tm_to_time64(tm);
+       u32 adj = secs + TWENTY_YEARS;
 
        do {
                __raw_writel((adj & 0xffff0000) >> 16, AICA_RTC_SECS_H);
@@ -73,9 +80,19 @@ static int aica_rtc_settimeofday(const time_t secs)
        return 0;
 }
 
-void aica_time_init(void)
+static const struct rtc_class_ops rtc_generic_ops = {
+       .read_time = aica_rtc_gettimeofday,
+       .set_time = aica_rtc_settimeofday,
+};
+
+static int __init aica_time_init(void)
 {
-       rtc_sh_get_time = aica_rtc_gettimeofday;
-       rtc_sh_set_time = aica_rtc_settimeofday;
-}
+       struct platform_device *pdev;
+
+       pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+                                            &rtc_generic_ops,
+                                            sizeof(rtc_generic_ops));
 
+       return PTR_ERR_OR_ZERO(pdev);
+}
+arch_initcall(aica_time_init);