rtc: s3c: Integrate Exynos3250 into S3C6410
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Sat, 2 May 2015 05:31:49 +0000 (14:31 +0900)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 19 Jun 2015 18:03:20 +0000 (20:03 +0200)
There are now no differences between RTC on Exynos3250 and S3C6410.
Merge everything into one so duplicated code could be removed.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-s3c.c

index 76cbad7a99d34d4bd6d1cb2baca98e08fc3264a7..a0f832362199078e439850223d51c185597b7b78 100644 (file)
@@ -772,18 +772,6 @@ 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",
@@ -799,7 +787,7 @@ static const struct of_device_id s3c_rtc_dt_match[] = {
                .data = (void *)&s3c6410_rtc_data,
        }, {
                .compatible = "samsung,exynos3250-rtc",
-               .data = (void *)&exynos3250_rtc_data,
+               .data = (void *)&s3c6410_rtc_data,
        },
        { /* sentinel */ },
 };