1 files changed, 92 insertions, 1 deletions

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 0d9089228bb0..a6b1252c9941 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -38,6 +38,7 @@ struct s3c_rtc {
 
         void __iomem *base;
         struct clk *rtc_clk;
+        struct clk *rtc_src_clk;
         bool enabled;
 
         struct s3c_rtc_data *data;
@@ -54,6 +55,7 @@ struct s3c_rtc {
 
 struct s3c_rtc_data {
         int max_user_freq;
+        bool needs_src_clk;
 
         void (*irq_handler) (struct s3c_rtc *info, int mask);
         void (*set_freq) (struct s3c_rtc *info, int freq);
@@ -73,10 +75,14 @@ static void s3c_rtc_alarm_clk_enable(struct s3c_rtc *info, bool enable)
         if (enable) {
                 if (!info->enabled) {
                         clk_enable(info->rtc_clk);
+                        if (info->data->needs_src_clk)
+                                clk_enable(info->rtc_src_clk);
                         info->enabled = true;
                 }
         } else {
                 if (info->enabled) {
+                        if (info->data->needs_src_clk)
+                                clk_disable(info->rtc_src_clk);
                         clk_disable(info->rtc_clk);
                         info->enabled = false;
                 }
@@ -114,12 +120,16 @@ static int s3c_rtc_setaie(struct device *dev, unsigned int enabled)
         dev_dbg(info->dev, "%s: aie=%d\n", __func__, enabled);
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
         tmp = readb(info->base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;
 
         if (enabled)
                 tmp |= S3C2410_RTCALM_ALMEN;
 
         writeb(tmp, info->base + S3C2410_RTCALM);
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         s3c_rtc_alarm_clk_enable(info, enabled);
@@ -134,12 +144,16 @@ static int s3c_rtc_setfreq(struct s3c_rtc *info, int freq)
                 return -EINVAL;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
         spin_lock_irq(&info->pie_lock);
 
         if (info->data->set_freq)
                 info->data->set_freq(info, freq);
 
         spin_unlock_irq(&info->pie_lock);
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -152,6 +166,9 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
         unsigned int have_retried = 0;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
+
  retry_get_time:
         rtc_tm->tm_min  = readb(info->base + S3C2410_RTCMIN);
         rtc_tm->tm_hour = readb(info->base + S3C2410_RTCHOUR);
@@ -185,6 +202,8 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
 
         rtc_tm->tm_mon -= 1;
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return rtc_valid_tm(rtc_tm);
@@ -207,6 +226,8 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
         }
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         writeb(bin2bcd(tm->tm_sec),  info->base + S3C2410_RTCSEC);
         writeb(bin2bcd(tm->tm_min),  info->base + S3C2410_RTCMIN);
@@ -215,6 +236,8 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
         writeb(bin2bcd(tm->tm_mon + 1), info->base + S3C2410_RTCMON);
         writeb(bin2bcd(year), info->base + S3C2410_RTCYEAR);
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -227,6 +250,9 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
         unsigned int alm_en;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
+
         alm_tm->tm_sec  = readb(info->base + S3C2410_ALMSEC);
         alm_tm->tm_min  = readb(info->base + S3C2410_ALMMIN);
         alm_tm->tm_hour = readb(info->base + S3C2410_ALMHOUR);
@@ -278,7 +304,10 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
         else
                 alm_tm->tm_year = -1;
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
+
         return 0;
 }
 
@@ -289,6 +318,9 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         unsigned int alrm_en;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
+
         dev_dbg(dev, "s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",
                  alrm->enabled,
                  1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
@@ -318,6 +350,8 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         s3c_rtc_setaie(dev, alrm->enabled);
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -328,10 +362,14 @@ static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
         struct s3c_rtc *info = dev_get_drvdata(dev);
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         if (info->data->enable_tick)
                 info->data->enable_tick(info, seq);
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -351,6 +389,8 @@ static void s3c24xx_rtc_enable(struct s3c_rtc *info)
         unsigned int con, tmp;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         con = readw(info->base + S3C2410_RTCCON);
         /* re-enable the device, and check it is ok */
@@ -378,6 +418,8 @@ static void s3c24xx_rtc_enable(struct s3c_rtc *info)
                         info->base + S3C2410_RTCCON);
         }
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 }
 
@@ -386,6 +428,8 @@ static void s3c24xx_rtc_disable(struct s3c_rtc *info)
         unsigned int con;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         con = readw(info->base + S3C2410_RTCCON);
         con &= ~S3C2410_RTCCON_RTCEN;
@@ -395,6 +439,8 @@ static void s3c24xx_rtc_disable(struct s3c_rtc *info)
         con &= ~S3C2410_TICNT_ENABLE;
         writeb(con, info->base + S3C2410_TICNT);
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 }
 
@@ -403,12 +449,16 @@ static void s3c6410_rtc_disable(struct s3c_rtc *info)
         unsigned int con;
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         con = readw(info->base + S3C2410_RTCCON);
         con &= ~S3C64XX_RTCCON_TICEN;
         con &= ~S3C2410_RTCCON_RTCEN;
         writew(con, info->base + S3C2410_RTCCON);
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 }
 
@@ -480,11 +530,19 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
         info->rtc_clk = devm_clk_get(&pdev->dev, "rtc");
         if (IS_ERR(info->rtc_clk)) {
-                dev_err(&pdev->dev, "failed to find rtc clock source\n");
+                dev_err(&pdev->dev, "failed to find rtc clock\n");
                 return PTR_ERR(info->rtc_clk);
         }
         clk_prepare_enable(info->rtc_clk);
 
+        info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src");
+        if (IS_ERR(info->rtc_src_clk)) {
+                dev_err(&pdev->dev, "failed to find rtc source clock\n");
+                return PTR_ERR(info->rtc_src_clk);
+        }
+        clk_prepare_enable(info->rtc_src_clk);
+
+
         /* check to see if everything is setup correctly */
         if (info->data->enable)
                 info->data->enable(info);
@@ -538,6 +596,8 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
         s3c_rtc_setfreq(info, 1);
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -557,6 +617,8 @@ static int s3c_rtc_suspend(struct device *dev)
         struct s3c_rtc *info = dev_get_drvdata(dev);
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         /* save TICNT for anyone using periodic interrupts */
         if (info->data->save_tick_cnt)
@@ -572,6 +634,8 @@ static int s3c_rtc_suspend(struct device *dev)
                         dev_err(dev, "enable_irq_wake failed\n");
         }
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -582,6 +646,8 @@ static int s3c_rtc_resume(struct device *dev)
         struct s3c_rtc *info = dev_get_drvdata(dev);
 
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
 
         if (info->data->enable)
                 info->data->enable(info);
@@ -594,6 +660,8 @@ static int s3c_rtc_resume(struct device *dev)
                 info->wake_en = false;
         }
 
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         return 0;
@@ -604,7 +672,11 @@ static SIMPLE_DEV_PM_OPS(s3c_rtc_pm_ops, s3c_rtc_suspend, s3c_rtc_resume);
 static void s3c24xx_rtc_irq(struct s3c_rtc *info, int mask)
 {
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
         rtc_update_irq(info->rtc, 1, RTC_AF | RTC_IRQF);
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         s3c_rtc_alarm_clk_enable(info, false);
@@ -613,8 +685,12 @@ static void s3c24xx_rtc_irq(struct s3c_rtc *info, int mask)
 static void s3c6410_rtc_irq(struct s3c_rtc *info, int mask)
 {
         clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
         rtc_update_irq(info->rtc, 1, RTC_AF | RTC_IRQF);
         writeb(mask, info->base + S3C2410_INTP);
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
         clk_disable(info->rtc_clk);
 
         s3c_rtc_alarm_clk_enable(info, false);
@@ -780,6 +856,18 @@ static struct s3c_rtc_data const s3c6410_rtc_data = {
         .disable                = s3c6410_rtc_disable,
 };
 
+static struct s3c_rtc_data const exynos3250_rtc_data = {
+        .max_user_freq          = 32768,
+        .needs_src_clk          = true,
+        .irq_handler            = s3c6410_rtc_irq,
+        .set_freq               = s3c6410_rtc_setfreq,
+        .enable_tick            = s3c6410_rtc_enable_tick,
+        .save_tick_cnt          = s3c6410_rtc_save_tick_cnt,
+        .restore_tick_cnt       = s3c6410_rtc_restore_tick_cnt,
+        .enable                 = s3c24xx_rtc_enable,
+        .disable                = s3c6410_rtc_disable,
+};
+
 static const struct of_device_id s3c_rtc_dt_match[] = {
         {
                 .compatible = "samsung,s3c2410-rtc",
@@ -793,6 +881,9 @@ static const struct of_device_id s3c_rtc_dt_match[] = {
         }, {
                 .compatible = "samsung,s3c6410-rtc",
                 .data = (void *)&s3c6410_rtc_data,
+        }, {
+                .compatible = "samsung,exynos3250-rtc",
+                .data = (void *)&exynos3250_rtc_data,
         },
         { /* sentinel */ },
 };