ARM: tegra30: pm: flush L1 data before exit coherency on secondary CPU
[linux-2.6.git] / drivers / rtc / rtc-cmos.c
index f7a4701..05beb6c 100644 (file)
@@ -36,6 +36,9 @@
 #include <linux/platform_device.h>
 #include <linux/mod_devicetable.h>
 #include <linux/log2.h>
+#include <linux/pm.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
 
 /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
 #include <asm-generic/rtc.h>
@@ -238,31 +241,32 @@ static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
        rtc_control = CMOS_READ(RTC_CONTROL);
        spin_unlock_irq(&rtc_lock);
 
-       /* REVISIT this assumes PC style usage:  always BCD */
-
-       if (((unsigned)t->time.tm_sec) < 0x60)
-               t->time.tm_sec = bcd2bin(t->time.tm_sec);
-       else
-               t->time.tm_sec = -1;
-       if (((unsigned)t->time.tm_min) < 0x60)
-               t->time.tm_min = bcd2bin(t->time.tm_min);
-       else
-               t->time.tm_min = -1;
-       if (((unsigned)t->time.tm_hour) < 0x24)
-               t->time.tm_hour = bcd2bin(t->time.tm_hour);
-       else
-               t->time.tm_hour = -1;
-
-       if (cmos->day_alrm) {
-               if (((unsigned)t->time.tm_mday) <= 0x31)
-                       t->time.tm_mday = bcd2bin(t->time.tm_mday);
+       if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
+               if (((unsigned)t->time.tm_sec) < 0x60)
+                       t->time.tm_sec = bcd2bin(t->time.tm_sec);
                else
-                       t->time.tm_mday = -1;
-               if (cmos->mon_alrm) {
-                       if (((unsigned)t->time.tm_mon) <= 0x12)
-                               t->time.tm_mon = bcd2bin(t->time.tm_mon) - 1;
+                       t->time.tm_sec = -1;
+               if (((unsigned)t->time.tm_min) < 0x60)
+                       t->time.tm_min = bcd2bin(t->time.tm_min);
+               else
+                       t->time.tm_min = -1;
+               if (((unsigned)t->time.tm_hour) < 0x24)
+                       t->time.tm_hour = bcd2bin(t->time.tm_hour);
+               else
+                       t->time.tm_hour = -1;
+
+               if (cmos->day_alrm) {
+                       if (((unsigned)t->time.tm_mday) <= 0x31)
+                               t->time.tm_mday = bcd2bin(t->time.tm_mday);
                        else
-                               t->time.tm_mon = -1;
+                               t->time.tm_mday = -1;
+
+                       if (cmos->mon_alrm) {
+                               if (((unsigned)t->time.tm_mon) <= 0x12)
+                                       t->time.tm_mon = bcd2bin(t->time.tm_mon)-1;
+                               else
+                                       t->time.tm_mon = -1;
+                       }
                }
        }
        t->time.tm_year = -1;
@@ -322,29 +326,26 @@ static void cmos_irq_disable(struct cmos_rtc *cmos, unsigned char mask)
 static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
-       unsigned char   mon, mday, hrs, min, sec;
+       unsigned char   mon, mday, hrs, min, sec, rtc_control;
 
        if (!is_valid_irq(cmos->irq))
                return -EIO;
 
-       /* REVISIT this assumes PC style usage:  always BCD */
-
-       /* Writing 0xff means "don't care" or "match all".  */
-
        mon = t->time.tm_mon + 1;
-       mon = (mon <= 12) ? bin2bcd(mon) : 0xff;
-
        mday = t->time.tm_mday;
-       mday = (mday >= 1 && mday <= 31) ? bin2bcd(mday) : 0xff;
-
        hrs = t->time.tm_hour;
-       hrs = (hrs < 24) ? bin2bcd(hrs) : 0xff;
-
        min = t->time.tm_min;
-       min = (min < 60) ? bin2bcd(min) : 0xff;
-
        sec = t->time.tm_sec;
-       sec = (sec < 60) ? bin2bcd(sec) : 0xff;
+
+       rtc_control = CMOS_READ(RTC_CONTROL);
+       if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
+               /* Writing 0xff means "don't care" or "match all".  */
+               mon = (mon <= 12) ? bin2bcd(mon) : 0xff;
+               mday = (mday >= 1 && mday <= 31) ? bin2bcd(mday) : 0xff;
+               hrs = (hrs < 24) ? bin2bcd(hrs) : 0xff;
+               min = (min < 60) ? bin2bcd(min) : 0xff;
+               sec = (sec < 60) ? bin2bcd(sec) : 0xff;
+       }
 
        spin_lock_irq(&rtc_lock);
 
@@ -376,94 +377,25 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
        return 0;
 }
 
-static int cmos_irq_set_freq(struct device *dev, int freq)
+static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
-       int             f;
        unsigned long   flags;
 
        if (!is_valid_irq(cmos->irq))
-               return -ENXIO;
-
-       if (!is_power_of_2(freq))
-               return -EINVAL;
-       /* 0 = no irqs; 1 = 2^15 Hz ... 15 = 2^0 Hz */
-       f = ffs(freq);
-       if (f-- > 16)
                return -EINVAL;
-       f = 16 - f;
-
-       spin_lock_irqsave(&rtc_lock, flags);
-       hpet_set_periodic_freq(freq);
-       CMOS_WRITE(RTC_REF_CLCK_32KHZ | f, RTC_FREQ_SELECT);
-       spin_unlock_irqrestore(&rtc_lock, flags);
-
-       return 0;
-}
-
-static int cmos_irq_set_state(struct device *dev, int enabled)
-{
-       struct cmos_rtc *cmos = dev_get_drvdata(dev);
-       unsigned long   flags;
-
-       if (!is_valid_irq(cmos->irq))
-               return -ENXIO;
 
        spin_lock_irqsave(&rtc_lock, flags);
 
        if (enabled)
-               cmos_irq_enable(cmos, RTC_PIE);
+               cmos_irq_enable(cmos, RTC_AIE);
        else
-               cmos_irq_disable(cmos, RTC_PIE);
-
-       spin_unlock_irqrestore(&rtc_lock, flags);
-       return 0;
-}
-
-#if defined(CONFIG_RTC_INTF_DEV) || defined(CONFIG_RTC_INTF_DEV_MODULE)
-
-static int
-cmos_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
-{
-       struct cmos_rtc *cmos = dev_get_drvdata(dev);
-       unsigned long   flags;
-
-       switch (cmd) {
-       case RTC_AIE_OFF:
-       case RTC_AIE_ON:
-       case RTC_UIE_OFF:
-       case RTC_UIE_ON:
-               if (!is_valid_irq(cmos->irq))
-                       return -EINVAL;
-               break;
-       /* PIE ON/OFF is handled by cmos_irq_set_state() */
-       default:
-               return -ENOIOCTLCMD;
-       }
-
-       spin_lock_irqsave(&rtc_lock, flags);
-       switch (cmd) {
-       case RTC_AIE_OFF:       /* alarm off */
                cmos_irq_disable(cmos, RTC_AIE);
-               break;
-       case RTC_AIE_ON:        /* alarm on */
-               cmos_irq_enable(cmos, RTC_AIE);
-               break;
-       case RTC_UIE_OFF:       /* update off */
-               cmos_irq_disable(cmos, RTC_UIE);
-               break;
-       case RTC_UIE_ON:        /* update on */
-               cmos_irq_enable(cmos, RTC_UIE);
-               break;
-       }
+
        spin_unlock_irqrestore(&rtc_lock, flags);
        return 0;
 }
 
-#else
-#define        cmos_rtc_ioctl  NULL
-#endif
-
 #if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE)
 
 static int cmos_procfs(struct device *dev, struct seq_file *seq)
@@ -484,7 +416,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
                        "update_IRQ\t: %s\n"
                        "HPET_emulated\t: %s\n"
                        // "square_wave\t: %s\n"
-                       // "BCD\t\t: %s\n"
+                       "BCD\t\t: %s\n"
                        "DST_enable\t: %s\n"
                        "periodic_freq\t: %d\n"
                        "batt_status\t: %s\n",
@@ -492,7 +424,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
                        (rtc_control & RTC_UIE) ? "yes" : "no",
                        is_hpet_enabled() ? "yes" : "no",
                        // (rtc_control & RTC_SQWE) ? "yes" : "no",
-                       // (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
+                       (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
                        (rtc_control & RTC_DST_EN) ? "yes" : "no",
                        cmos->rtc->irq_freq,
                        (valid & RTC_VRT) ? "okay" : "dead");
@@ -503,14 +435,12 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
 #endif
 
 static const struct rtc_class_ops cmos_rtc_ops = {
-       .ioctl          = cmos_rtc_ioctl,
-       .read_time      = cmos_read_time,
-       .set_time       = cmos_set_time,
-       .read_alarm     = cmos_read_alarm,
-       .set_alarm      = cmos_set_alarm,
-       .proc           = cmos_procfs,
-       .irq_set_freq   = cmos_irq_set_freq,
-       .irq_set_state  = cmos_irq_set_state,
+       .read_time              = cmos_read_time,
+       .set_time               = cmos_set_time,
+       .read_alarm             = cmos_read_alarm,
+       .set_alarm              = cmos_set_alarm,
+       .proc                   = cmos_procfs,
+       .alarm_irq_enable       = cmos_alarm_irq_enable,
 };
 
 /*----------------------------------------------------------------*/
@@ -524,7 +454,8 @@ static const struct rtc_class_ops cmos_rtc_ops = {
 #define NVRAM_OFFSET   (RTC_REG_D + 1)
 
 static ssize_t
-cmos_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
+cmos_nvram_read(struct file *filp, struct kobject *kobj,
+               struct bin_attribute *attr,
                char *buf, loff_t off, size_t count)
 {
        int     retval;
@@ -552,7 +483,8 @@ cmos_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-cmos_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
+cmos_nvram_write(struct file *filp, struct kobject *kobj,
+               struct bin_attribute *attr,
                char *buf, loff_t off, size_t count)
 {
        struct cmos_rtc *cmos;
@@ -674,7 +606,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
         * (needing ioremap etc), not i/o space resources like this ...
         */
        ports = request_region(ports->start,
-                       ports->end + 1 - ports->start,
+                       resource_size(ports),
                        driver_name);
        if (!ports) {
                dev_dbg(dev, "i/o registers already in use\n");
@@ -691,7 +623,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
         */
 #if    defined(CONFIG_ATARI)
        address_space = 64;
-#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__sparc__)
+#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \
+                       || defined(__sparc__) || defined(__mips__) \
+                       || defined(__powerpc__)
        address_space = 128;
 #else
 #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes.
@@ -723,6 +657,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                }
        }
 
+       cmos_rtc.dev = dev;
+       dev_set_drvdata(dev, &cmos_rtc);
+
        cmos_rtc.rtc = rtc_device_register(driver_name, dev,
                                &cmos_rtc_ops, THIS_MODULE);
        if (IS_ERR(cmos_rtc.rtc)) {
@@ -730,8 +667,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                goto cleanup0;
        }
 
-       cmos_rtc.dev = dev;
-       dev_set_drvdata(dev, &cmos_rtc);
        rename_region(ports, dev_name(&cmos_rtc.rtc->dev));
 
        spin_lock_irq(&rtc_lock);
@@ -753,12 +688,11 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 
        spin_unlock_irq(&rtc_lock);
 
-       /* FIXME teach the alarm code how to handle binary mode;
+       /* FIXME:
         * <asm-generic/rtc.h> doesn't know 12-hour mode either.
         */
-       if (is_valid_irq(rtc_irq) &&
-           (!(rtc_control & RTC_24H) || (rtc_control & (RTC_DM_BINARY)))) {
-               dev_dbg(dev, "only 24-hr BCD mode supported\n");
+       if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) {
+               dev_warn(dev, "only 24-hr supported\n");
                retval = -ENXIO;
                goto cleanup1;
        }
@@ -816,7 +750,7 @@ cleanup1:
        cmos_rtc.dev = NULL;
        rtc_device_unregister(cmos_rtc.rtc);
 cleanup0:
-       release_region(ports->start, ports->end + 1 - ports->start);
+       release_region(ports->start, resource_size(ports));
        return retval;
 }
 
@@ -845,7 +779,7 @@ static void __exit cmos_do_remove(struct device *dev)
        cmos->rtc = NULL;
 
        ports = cmos->iomem;
-       release_region(ports->start, ports->end + 1 - ports->start);
+       release_region(ports->start, resource_size(ports));
        cmos->iomem = NULL;
 
        cmos->dev = NULL;
@@ -854,7 +788,7 @@ static void __exit cmos_do_remove(struct device *dev)
 
 #ifdef CONFIG_PM
 
-static int cmos_suspend(struct device *dev, pm_message_t mesg)
+static int cmos_suspend(struct device *dev)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
        unsigned char   tmp;
@@ -871,8 +805,9 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
                        mask = RTC_IRQMASK;
                tmp &= ~mask;
                CMOS_WRITE(tmp, RTC_CONTROL);
-               hpet_mask_rtc_irq_bit(mask);
 
+               /* shut down hpet emulation - we don't need it for alarm */
+               hpet_mask_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE);
                cmos_checkintr(cmos, tmp);
        }
        spin_unlock_irq(&rtc_lock);
@@ -901,7 +836,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
  */
 static inline int cmos_poweroff(struct device *dev)
 {
-       return cmos_suspend(dev, PMSG_HIBERNATE);
+       return cmos_suspend(dev);
 }
 
 static int cmos_resume(struct device *dev)
@@ -948,9 +883,9 @@ static int cmos_resume(struct device *dev)
        return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
+
 #else
-#define        cmos_suspend    NULL
-#define        cmos_resume     NULL
 
 static inline int cmos_poweroff(struct device *dev)
 {
@@ -973,7 +908,6 @@ static inline int cmos_poweroff(struct device *dev)
 
 #include <linux/acpi.h>
 
-#ifdef CONFIG_PM
 static u32 rtc_handler(void *context)
 {
        acpi_clear_event(ACPI_EVENT_RTC);
@@ -1002,11 +936,6 @@ static void rtc_wake_off(struct device *dev)
 {
        acpi_disable_event(ACPI_EVENT_RTC, 0);
 }
-#else
-#define rtc_wake_setup()       do{}while(0)
-#define rtc_wake_on            NULL
-#define rtc_wake_off           NULL
-#endif
 
 /* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find
  * its device node and pass extra config data.  This helps its driver use
@@ -1086,7 +1015,7 @@ static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
 
 static int cmos_pnp_suspend(struct pnp_dev *pnp, pm_message_t mesg)
 {
-       return cmos_suspend(&pnp->dev, mesg);
+       return cmos_suspend(&pnp->dev);
 }
 
 static int cmos_pnp_resume(struct pnp_dev *pnp)
@@ -1099,9 +1028,9 @@ static int cmos_pnp_resume(struct pnp_dev *pnp)
 #define        cmos_pnp_resume         NULL
 #endif
 
-static void cmos_pnp_shutdown(struct device *pdev)
+static void cmos_pnp_shutdown(struct pnp_dev *pnp)
 {
-       if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev))
+       if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pnp->dev))
                return;
 
        cmos_do_shutdown();
@@ -1120,19 +1049,57 @@ static struct pnp_driver cmos_pnp_driver = {
        .id_table       = rtc_ids,
        .probe          = cmos_pnp_probe,
        .remove         = __exit_p(cmos_pnp_remove),
+       .shutdown       = cmos_pnp_shutdown,
 
        /* flag ensures resume() gets called, and stops syslog spam */
        .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
        .suspend        = cmos_pnp_suspend,
        .resume         = cmos_pnp_resume,
-       .driver         = {
-               .name     = (char *)driver_name,
-               .shutdown = cmos_pnp_shutdown,
-       }
 };
 
 #endif /* CONFIG_PNP */
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_cmos_match[] = {
+       {
+               .compatible = "motorola,mc146818",
+       },
+       { },
+};
+MODULE_DEVICE_TABLE(of, of_cmos_match);
+
+static __init void cmos_of_init(struct platform_device *pdev)
+{
+       struct device_node *node = pdev->dev.of_node;
+       struct rtc_time time;
+       int ret;
+       const __be32 *val;
+
+       if (!node)
+               return;
+
+       val = of_get_property(node, "ctrl-reg", NULL);
+       if (val)
+               CMOS_WRITE(be32_to_cpup(val), RTC_CONTROL);
+
+       val = of_get_property(node, "freq-reg", NULL);
+       if (val)
+               CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
+
+       get_rtc_time(&time);
+       ret = rtc_valid_tm(&time);
+       if (ret) {
+               struct rtc_time def_time = {
+                       .tm_year = 1,
+                       .tm_mday = 1,
+               };
+               set_rtc_time(&def_time);
+       }
+}
+#else
+static inline void cmos_of_init(struct platform_device *pdev) {}
+#define of_cmos_match NULL
+#endif
 /*----------------------------------------------------------------*/
 
 /* Platform setup should have set up an RTC device, when PNP is
@@ -1141,6 +1108,7 @@ static struct pnp_driver cmos_pnp_driver = {
 
 static int __init cmos_platform_probe(struct platform_device *pdev)
 {
+       cmos_of_init(pdev);
        cmos_wake_setup(&pdev->dev);
        return cmos_do_probe(&pdev->dev,
                        platform_get_resource(pdev, IORESOURCE_IO, 0),
@@ -1169,8 +1137,10 @@ static struct platform_driver cmos_platform_driver = {
        .shutdown       = cmos_platform_shutdown,
        .driver = {
                .name           = (char *) driver_name,
-               .suspend        = cmos_suspend,
-               .resume         = cmos_resume,
+#ifdef CONFIG_PM
+               .pm             = &cmos_pm_ops,
+#endif
+               .of_match_table = of_cmos_match,
        }
 };