Patched in Tegra support.

1 files changed, 55 insertions, 86 deletions

diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 08378e3cc21..ff1b84bd9bb 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -68,26 +68,11 @@
 
 #define RTC_TIMER_FREQ 32768
 
-/**
- * struct pl031_vendor_data - per-vendor variations
- * @ops: the vendor-specific operations used on this silicon version
- * @clockwatch: if this is an ST Microelectronics silicon version with a
- *      clockwatch function
- * @st_weekday: if this is an ST Microelectronics silicon version that need
- *      the weekday fix
- * @irqflags: special IRQ flags per variant
- */
-struct pl031_vendor_data {
-        struct rtc_class_ops ops;
-        bool clockwatch;
-        bool st_weekday;
-        unsigned long irqflags;
-};
-
 struct pl031_local {
-        struct pl031_vendor_data *vendor;
         struct rtc_device *rtc;
         void __iomem *base;
+        u8 hw_designer;
+        u8 hw_revision:4;
 };
 
 static int pl031_alarm_irq_enable(struct device *dev,
@@ -235,9 +220,17 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id)
         unsigned long events = 0;
 
         rtcmis = readl(ldata->base + RTC_MIS);
-        if (rtcmis & RTC_BIT_AI) {
-                writel(RTC_BIT_AI, ldata->base + RTC_ICR);
-                events |= (RTC_AF | RTC_IRQF);
+        if (rtcmis) {
+                writel(rtcmis, ldata->base + RTC_ICR);
+
+                if (rtcmis & RTC_BIT_AI)
+                        events |= (RTC_AF | RTC_IRQF);
+
+                /* Timer interrupt is only available in ST variants */
+                if ((rtcmis & RTC_BIT_PI) &&
+                        (ldata->hw_designer == AMBA_VENDOR_ST))
+                        events |= (RTC_PF | RTC_IRQF);
+
                 rtc_update_irq(ldata->rtc, 1, events);
 
                 return IRQ_HANDLED;
@@ -318,9 +311,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 {
         int ret;
         struct pl031_local *ldata;
-        struct pl031_vendor_data *vendor = id->data;
-        struct rtc_class_ops *ops = &vendor->ops;
-        unsigned long time;
+        struct rtc_class_ops *ops = id->data;
 
         ret = amba_request_regions(adev, NULL);
         if (ret)
@@ -331,7 +322,6 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
                 ret = -ENOMEM;
                 goto out;
         }
-        ldata->vendor = vendor;
 
         ldata->base = ioremap(adev->res.start, resource_size(&adev->res));
 
@@ -342,31 +332,18 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 
         amba_set_drvdata(adev, ldata);
 
-        dev_dbg(&adev->dev, "designer ID = 0x%02x\n", amba_manf(adev));
-        dev_dbg(&adev->dev, "revision = 0x%01x\n", amba_rev(adev));
+        ldata->hw_designer = amba_manf(adev);
+        ldata->hw_revision = amba_rev(adev);
+
+        dev_dbg(&adev->dev, "designer ID = 0x%02x\n", ldata->hw_designer);
+        dev_dbg(&adev->dev, "revision = 0x%01x\n", ldata->hw_revision);
 
         /* Enable the clockwatch on ST Variants */
-        if (vendor->clockwatch)
+        if ((ldata->hw_designer == AMBA_VENDOR_ST) &&
+            (ldata->hw_revision > 1))
                 writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN,
                        ldata->base + RTC_CR);
 
-        /*
-         * On ST PL031 variants, the RTC reset value does not provide correct
-         * weekday for 2000-01-01. Correct the erroneous sunday to saturday.
-         */
-        if (vendor->st_weekday) {
-                if (readl(ldata->base + RTC_YDR) == 0x2000) {
-                        time = readl(ldata->base + RTC_DR);
-                        if ((time &
-                             (RTC_MON_MASK | RTC_MDAY_MASK | RTC_WDAY_MASK))
-                            == 0x02120000) {
-                                time = time | (0x7 << RTC_WDAY_SHIFT);
-                                writel(0x2000, ldata->base + RTC_YLR);
-                                writel(time, ldata->base + RTC_LR);
-                        }
-                }
-        }
-
         ldata->rtc = rtc_device_register("pl031", &adev->dev, ops,
                                         THIS_MODULE);
         if (IS_ERR(ldata->rtc)) {
@@ -375,7 +352,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
         }
 
         if (request_irq(adev->irq[0], pl031_interrupt,
-                        vendor->irqflags, "rtc-pl031", ldata)) {
+                        IRQF_DISABLED, "rtc-pl031", ldata)) {
                 ret = -EIO;
                 goto out_no_irq;
         }
@@ -397,71 +374,52 @@ err_req:
 }
 
 /* Operations for the original ARM version */
-static struct pl031_vendor_data arm_pl031 = {
-        .ops = {
-                .read_time = pl031_read_time,
-                .set_time = pl031_set_time,
-                .read_alarm = pl031_read_alarm,
-                .set_alarm = pl031_set_alarm,
-                .alarm_irq_enable = pl031_alarm_irq_enable,
-        },
-        .irqflags = IRQF_NO_SUSPEND,
+static struct rtc_class_ops arm_pl031_ops = {
+        .read_time = pl031_read_time,
+        .set_time = pl031_set_time,
+        .read_alarm = pl031_read_alarm,
+        .set_alarm = pl031_set_alarm,
+        .alarm_irq_enable = pl031_alarm_irq_enable,
 };
 
 /* The First ST derivative */
-static struct pl031_vendor_data stv1_pl031 = {
-        .ops = {
-                .read_time = pl031_read_time,
-                .set_time = pl031_set_time,
-                .read_alarm = pl031_read_alarm,
-                .set_alarm = pl031_set_alarm,
-                .alarm_irq_enable = pl031_alarm_irq_enable,
-        },
-        .clockwatch = true,
-        .st_weekday = true,
-        .irqflags = IRQF_NO_SUSPEND,
+static struct rtc_class_ops stv1_pl031_ops = {
+        .read_time = pl031_read_time,
+        .set_time = pl031_set_time,
+        .read_alarm = pl031_read_alarm,
+        .set_alarm = pl031_set_alarm,
+        .alarm_irq_enable = pl031_alarm_irq_enable,
 };
 
 /* And the second ST derivative */
-static struct pl031_vendor_data stv2_pl031 = {
-        .ops = {
-                .read_time = pl031_stv2_read_time,
-                .set_time = pl031_stv2_set_time,
-                .read_alarm = pl031_stv2_read_alarm,
-                .set_alarm = pl031_stv2_set_alarm,
-                .alarm_irq_enable = pl031_alarm_irq_enable,
-        },
-        .clockwatch = true,
-        .st_weekday = true,
-        /*
-         * This variant shares the IRQ with another block and must not
-         * suspend that IRQ line.
-         */
-        .irqflags = IRQF_SHARED | IRQF_NO_SUSPEND,
+static struct rtc_class_ops stv2_pl031_ops = {
+        .read_time = pl031_stv2_read_time,
+        .set_time = pl031_stv2_set_time,
+        .read_alarm = pl031_stv2_read_alarm,
+        .set_alarm = pl031_stv2_set_alarm,
+        .alarm_irq_enable = pl031_alarm_irq_enable,
 };
 
 static struct amba_id pl031_ids[] = {
         {
                 .id = 0x00041031,
                 .mask = 0x000fffff,
-                .data = &arm_pl031,
+                .data = &arm_pl031_ops,
         },
         /* ST Micro variants */
         {
                 .id = 0x00180031,
                 .mask = 0x00ffffff,
-                .data = &stv1_pl031,
+                .data = &stv1_pl031_ops,
         },
         {
                 .id = 0x00280031,
                 .mask = 0x00ffffff,
-                .data = &stv2_pl031,
+                .data = &stv2_pl031_ops,
         },
         {0, 0},
 };
 
-MODULE_DEVICE_TABLE(amba, pl031_ids);
-
 static struct amba_driver pl031_driver = {
         .drv = {
                 .name = "rtc-pl031",
@@ -471,7 +429,18 @@ static struct amba_driver pl031_driver = {
         .remove = pl031_remove,
 };
 
-module_amba_driver(pl031_driver);
+static int __init pl031_init(void)
+{
+        return amba_driver_register(&pl031_driver);
+}
+
+static void __exit pl031_exit(void)
+{
+        amba_driver_unregister(&pl031_driver);
+}
+
+module_init(pl031_init);
+module_exit(pl031_exit);
 
 MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net");
 MODULE_DESCRIPTION("ARM AMBA PL031 RTC Driver");