2015-05-02 05:32:21

by Krzysztof Kozłowski

Subject: [PATCH v2] rtc: s3c: Integrate Exynos3250 into S3C6410

From: Krzysztof Kozlowski <[email protected]>

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 <[email protected]>
Reviewed-by: Chanwoo Choi <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
Reviewed-by: Javier Martinez Canillas <[email protected]>
Signed-off-by: Krzysztof Kozlowski <[email protected]>

---
Changes since v1:
1. Add acks and reviews.
---
drivers/rtc/rtc-s3c.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 76cbad7a99d3..a0f832362199 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -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 */ },
};
--
2.1.4

2015-05-03 11:53:04

by Alexandre Belloni

Subject: Re: [PATCH v2] rtc: s3c: Integrate Exynos3250 into S3C6410

On 02/05/2015 at 14:31:49 +0900, Krzysztof Kozlowski wrote :
> From: Krzysztof Kozlowski <[email protected]>
>
> 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 <[email protected]>
> Reviewed-by: Chanwoo Choi <[email protected]>
> Acked-by: Alexandre Belloni <[email protected]>
> Reviewed-by: Javier Martinez Canillas <[email protected]>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> ---
> Changes since v1:
> 1. Add acks and reviews.
> ---
> drivers/rtc/rtc-s3c.c | 14 +-------------
> 1 file changed, 1 insertion(+), 13 deletions(-)
>
Applied, thanks.

--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com