rtc: s3c: add s3c_rtc_data structure to use variant data instead of s3c_cpu_type

Add s3c_rtc_data structure to variant data according to SoC type.  The
s3c_rtc_data structure includes some functions to control RTC operation
and specific data dependent on SoC type.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 289 insertions, 172 deletions

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 4e95cca7615c..0d9089228bb0 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -32,17 +32,6 @@
 #include <asm/irq.h>
 #include "rtc-s3c.h"
 
-enum s3c_cpu_type {
-        TYPE_S3C2410,
-        TYPE_S3C2416,
-        TYPE_S3C2443,
-        TYPE_S3C64XX,
-};
-
-struct s3c_rtc_drv_data {
-        int cpu_type;
-};
-
 struct s3c_rtc {
         struct device *dev;
         struct rtc_device *rtc;
@@ -51,7 +40,7 @@ struct s3c_rtc {
         struct clk *rtc_clk;
         bool enabled;
 
-        enum s3c_cpu_type cpu_type;
+        struct s3c_rtc_data *data;
 
         int irq_alarm;
         int irq_tick;
@@ -63,6 +52,19 @@ struct s3c_rtc {
         bool wake_en;
 };
 
+struct s3c_rtc_data {
+        int max_user_freq;
+
+        void (*irq_handler) (struct s3c_rtc *info, int mask);
+        void (*set_freq) (struct s3c_rtc *info, int freq);
+        void (*enable_tick) (struct s3c_rtc *info, struct seq_file *seq);
+        void (*select_tick_clk) (struct s3c_rtc *info);
+        void (*save_tick_cnt) (struct s3c_rtc *info);
+        void (*restore_tick_cnt) (struct s3c_rtc *info);
+        void (*enable) (struct s3c_rtc *info);
+        void (*disable) (struct s3c_rtc *info);
+};
+
 static void s3c_rtc_alarm_clk_enable(struct s3c_rtc *info, bool enable)
 {
         unsigned long irq_flags;
@@ -83,34 +85,22 @@ static void s3c_rtc_alarm_clk_enable(struct s3c_rtc *info, bool enable)
 }
 
 /* IRQ Handlers */
-static irqreturn_t s3c_rtc_alarmirq(int irq, void *id)
+static irqreturn_t s3c_rtc_tickirq(int irq, void *id)
 {
         struct s3c_rtc *info = (struct s3c_rtc *)id;
 
-        clk_enable(info->rtc_clk);
-        rtc_update_irq(info->rtc, 1, RTC_AF | RTC_IRQF);
-
-        if (info->cpu_type == TYPE_S3C64XX)
-                writeb(S3C2410_INTP_ALM, info->base + S3C2410_INTP);
-
-        clk_disable(info->rtc_clk);
-
-        s3c_rtc_alarm_clk_enable(info, false);
+        if (info->data->irq_handler)
+                info->data->irq_handler(info, S3C2410_INTP_TIC);
 
         return IRQ_HANDLED;
 }
 
-static irqreturn_t s3c_rtc_tickirq(int irq, void *id)
+static irqreturn_t s3c_rtc_alarmirq(int irq, void *id)
 {
         struct s3c_rtc *info = (struct s3c_rtc *)id;
 
-        clk_enable(info->rtc_clk);
-        rtc_update_irq(info->rtc, 1, RTC_PF | RTC_IRQF);
-
-        if (info->cpu_type == TYPE_S3C64XX)
-                writeb(S3C2410_INTP_TIC, info->base + S3C2410_INTP);
-
-        clk_disable(info->rtc_clk);
+        if (info->data->irq_handler)
+                info->data->irq_handler(info, S3C2410_INTP_ALM);
 
         return IRQ_HANDLED;
 }
@@ -137,36 +127,18 @@ static int s3c_rtc_setaie(struct device *dev, unsigned int enabled)
         return 0;
 }
 
+/* Set RTC frequency */
 static int s3c_rtc_setfreq(struct s3c_rtc *info, int freq)
 {
-        unsigned int tmp = 0;
-        int val;
-
         if (!is_power_of_2(freq))
                 return -EINVAL;
 
         clk_enable(info->rtc_clk);
         spin_lock_irq(&info->pie_lock);
 
-        if (info->cpu_type != TYPE_S3C64XX) {
-                tmp = readb(info->base + S3C2410_TICNT);
-                tmp &= S3C2410_TICNT_ENABLE;
-        }
-
-        val = (info->rtc->max_user_freq / freq) - 1;
-
-        if (info->cpu_type == TYPE_S3C2416 || info->cpu_type == TYPE_S3C2443) {
-                tmp |= S3C2443_TICNT_PART(val);
-                writel(S3C2443_TICNT1_PART(val), info->base + S3C2443_TICNT1);
+        if (info->data->set_freq)
+                info->data->set_freq(info, freq);
 
-                if (info->cpu_type == TYPE_S3C2416)
-                        writel(S3C2416_TICNT2_PART(val),
-                                info->base + S3C2416_TICNT2);
-        } else {
-                tmp |= val;
-        }
-
-        writel(tmp, info->base + S3C2410_TICNT);
         spin_unlock_irq(&info->pie_lock);
         clk_disable(info->rtc_clk);
 
@@ -174,7 +146,6 @@ static int s3c_rtc_setfreq(struct s3c_rtc *info, int freq)
 }
 
 /* Time read/write */
-
 static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
 {
         struct s3c_rtc *info = dev_get_drvdata(dev);
@@ -355,19 +326,14 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
 static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct s3c_rtc *info = dev_get_drvdata(dev);
-        unsigned int ticnt;
 
         clk_enable(info->rtc_clk);
-        if (info->cpu_type == TYPE_S3C64XX) {
-                ticnt = readw(info->base + S3C2410_RTCCON);
-                ticnt &= S3C64XX_RTCCON_TICEN;
-        } else {
-                ticnt = readb(info->base + S3C2410_TICNT);
-                ticnt &= S3C2410_TICNT_ENABLE;
-        }
 
-        seq_printf(seq, "periodic_IRQ\t: %s\n", ticnt  ? "yes" : "no");
+        if (info->data->enable_tick)
+                info->data->enable_tick(info, seq);
+
         clk_disable(info->rtc_clk);
+
         return 0;
 }
 
@@ -380,50 +346,69 @@ static const struct rtc_class_ops s3c_rtcops = {
         .alarm_irq_enable = s3c_rtc_setaie,
 };
 
-static void s3c_rtc_enable(struct s3c_rtc *info, int en)
+static void s3c24xx_rtc_enable(struct s3c_rtc *info)
 {
         unsigned int con, tmp;
 
         clk_enable(info->rtc_clk);