LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 0/2] ARM: EXYNOS: Minor S3C RTC cleanups
@ 2015-03-30 15:19 Krzysztof Kozlowski
  2015-03-30 15:19 ` [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410 Krzysztof Kozlowski
  2015-03-30 15:19 ` [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc Krzysztof Kozlowski
  0 siblings, 2 replies; 15+ messages in thread
From: Krzysztof Kozlowski @ 2015-03-30 15:19 UTC (permalink / raw)
  To: Kukjin Kim, Alessandro Zummo, Chanwoo Choi, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Alexandre Belloni
  Cc: Kyungmin Park, Krzysztof Kozlowski

Hi,

Now the s3c6410-rtc is exactly the same as exynos3250-rtc. Mark the
second one as deprecated and switch to one binding.

Patches are independent.

Best regards,
Krzysztof

Krzysztof Kozlowski (3):
  drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  ARM: dts: Use define for s3c-rtc clock id

 Documentation/devicetree/bindings/rtc/s3c-rtc.txt |  3 ++-
 arch/arm/boot/dts/exynos3250-rinato.dts           |  3 ++-
 arch/arm/boot/dts/exynos3250.dtsi                 |  2 +-
 arch/arm/boot/dts/exynos4415.dtsi                 |  2 +-
 drivers/rtc/rtc-s3c.c                             | 14 +-------------
 5 files changed, 7 insertions(+), 17 deletions(-)

-- 
1.9.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  2015-03-30 15:19 [PATCH 0/2] ARM: EXYNOS: Minor S3C RTC cleanups Krzysztof Kozlowski
@ 2015-03-30 15:19 ` Krzysztof Kozlowski
  2015-03-30 23:37   ` Chanwoo Choi
  2015-03-31  0:27   ` Alexandre Belloni
  2015-03-30 15:19 ` [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc Krzysztof Kozlowski
  1 sibling, 2 replies; 15+ messages in thread
From: Krzysztof Kozlowski @ 2015-03-30 15:19 UTC (permalink / raw)
  To: Kukjin Kim, Alessandro Zummo, Chanwoo Choi, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Alexandre Belloni
  Cc: Kyungmin Park, Krzysztof Kozlowski

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>
---
 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 fb0c569765c6..5e162eaad277 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -774,18 +774,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",
@@ -801,7 +789,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 */ },
 };
-- 
1.9.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-30 15:19 [PATCH 0/2] ARM: EXYNOS: Minor S3C RTC cleanups Krzysztof Kozlowski
  2015-03-30 15:19 ` [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410 Krzysztof Kozlowski
@ 2015-03-30 15:19 ` Krzysztof Kozlowski
  2015-03-30 23:38   ` Chanwoo Choi
  1 sibling, 1 reply; 15+ messages in thread
From: Krzysztof Kozlowski @ 2015-03-30 15:19 UTC (permalink / raw)
  To: Kukjin Kim, Alessandro Zummo, Chanwoo Choi, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Alexandre Belloni
  Cc: Kyungmin Park, Krzysztof Kozlowski

Mark "samsung,exynos3250-rtc" compatible as deprecated because it
duplicates the "samsung,s3c6410-rtc". Use "samsung,s3c6410-rtc" on
Exynos3250 and Exynos4415 boards.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 ++-
 arch/arm/boot/dts/exynos3250.dtsi                 | 2 +-
 arch/arm/boot/dts/exynos4415.dtsi                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
index ab757b84daa7..ac2fcd6ff4b8 100644
--- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
@@ -6,7 +6,8 @@ Required properties:
     * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
     * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
     * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
-    * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
+    * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
+                                 exynos3250 rtc (use "samsung,s3c6410-rtc").
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: Two interrupt numbers to the cpu should be specified. First
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index e3bfb11c6ef8..8d58b550e925 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -189,7 +189,7 @@
 		};
 
 		rtc: rtc@10070000 {
-			compatible = "samsung,exynos3250-rtc";
+			compatible = "samsung,s3c6410-rtc";
 			reg = <0x10070000 0x100>;
 			interrupts = <0 73 0>, <0 74 0>;
 			interrupt-parent = <&pmu_system_controller>;
diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
index 5caea996e090..186cb8465683 100644
--- a/arch/arm/boot/dts/exynos4415.dtsi
+++ b/arch/arm/boot/dts/exynos4415.dtsi
@@ -177,7 +177,7 @@
 		};
 
 		rtc: rtc@10070000 {
-			compatible = "samsung,exynos3250-rtc";
+			compatible = "samsung,s3c6410-rtc";
 			reg = <0x10070000 0x100>;
 			interrupts = <0 73 0>, <0 74 0>;
 			status = "disabled";
-- 
1.9.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  2015-03-30 15:19 ` [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410 Krzysztof Kozlowski
@ 2015-03-30 23:37   ` Chanwoo Choi
  2015-03-31  0:27   ` Alexandre Belloni
  1 sibling, 0 replies; 15+ messages in thread
From: Chanwoo Choi @ 2015-03-30 23:37 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Kukjin Kim, Alessandro Zummo, devicetree, linux-kernel,
	linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Alexandre Belloni, Kyungmin Park

On 03/31/2015 12:19 AM, Krzysztof Kozlowski wrote:
> 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>
> ---
>  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 fb0c569765c6..5e162eaad277 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -774,18 +774,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",
> @@ -801,7 +789,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 */ },
>  };
> 

Looks good to me.

Reviewd-by: Chanwoo Choi <cw00.choi@samsung.com>

Thanks,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-30 15:19 ` [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc Krzysztof Kozlowski
@ 2015-03-30 23:38   ` Chanwoo Choi
  2015-03-31  0:31     ` Alexandre Belloni
  2015-03-31  6:43     ` Javier Martinez Canillas
  0 siblings, 2 replies; 15+ messages in thread
From: Chanwoo Choi @ 2015-03-30 23:38 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Kukjin Kim, Alessandro Zummo, devicetree, linux-kernel,
	linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Alexandre Belloni, Kyungmin Park

On 03/31/2015 12:19 AM, Krzysztof Kozlowski wrote:
> Mark "samsung,exynos3250-rtc" compatible as deprecated because it
> duplicates the "samsung,s3c6410-rtc". Use "samsung,s3c6410-rtc" on
> Exynos3250 and Exynos4415 boards.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 ++-
>  arch/arm/boot/dts/exynos3250.dtsi                 | 2 +-
>  arch/arm/boot/dts/exynos4415.dtsi                 | 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> index ab757b84daa7..ac2fcd6ff4b8 100644
> --- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> +++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> @@ -6,7 +6,8 @@ Required properties:
>      * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
>      * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
>      * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
> -    * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
> +    * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
> +                                 exynos3250 rtc (use "samsung,s3c6410-rtc").
>  - reg: physical base address of the controller and length of memory mapped
>    region.
>  - interrupts: Two interrupt numbers to the cpu should be specified. First
> diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
> index e3bfb11c6ef8..8d58b550e925 100644
> --- a/arch/arm/boot/dts/exynos3250.dtsi
> +++ b/arch/arm/boot/dts/exynos3250.dtsi
> @@ -189,7 +189,7 @@
>  		};
>  
>  		rtc: rtc@10070000 {
> -			compatible = "samsung,exynos3250-rtc";
> +			compatible = "samsung,s3c6410-rtc";
>  			reg = <0x10070000 0x100>;
>  			interrupts = <0 73 0>, <0 74 0>;
>  			interrupt-parent = <&pmu_system_controller>;
> diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
> index 5caea996e090..186cb8465683 100644
> --- a/arch/arm/boot/dts/exynos4415.dtsi
> +++ b/arch/arm/boot/dts/exynos4415.dtsi
> @@ -177,7 +177,7 @@
>  		};
>  
>  		rtc: rtc@10070000 {
> -			compatible = "samsung,exynos3250-rtc";
> +			compatible = "samsung,s3c6410-rtc";
>  			reg = <0x10070000 0x100>;
>  			interrupts = <0 73 0>, <0 74 0>;
>  			status = "disabled";
> 

Looks good to me.

Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>

Thanks,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  2015-03-30 15:19 ` [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410 Krzysztof Kozlowski
  2015-03-30 23:37   ` Chanwoo Choi
@ 2015-03-31  0:27   ` Alexandre Belloni
  2015-03-31  6:49     ` Javier Martinez Canillas
  1 sibling, 1 reply; 15+ messages in thread
From: Alexandre Belloni @ 2015-03-31  0:27 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Kukjin Kim, Alessandro Zummo, Chanwoo Choi, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Kyungmin Park

nitpick: I would prefer rtc: rtc-s3c instead of drivers/rtc/rtc-s3c.c

On 30/03/2015 at 17:19:32 +0200, Krzysztof Kozlowski wrote :
> 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>

Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

> ---
>  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 fb0c569765c6..5e162eaad277 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -774,18 +774,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",
> @@ -801,7 +789,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 */ },
>  };
> -- 
> 1.9.1
> 

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-30 23:38   ` Chanwoo Choi
@ 2015-03-31  0:31     ` Alexandre Belloni
  2015-03-31  0:47       ` Chanwoo Choi
  2015-03-31  6:43     ` Javier Martinez Canillas
  1 sibling, 1 reply; 15+ messages in thread
From: Alexandre Belloni @ 2015-03-31  0:31 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Kyungmin Park

Hi,

On 31/03/2015 at 08:38:30 +0900, Chanwoo Choi wrote :
> > diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> > index ab757b84daa7..ac2fcd6ff4b8 100644
> > --- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> > +++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> > @@ -6,7 +6,8 @@ Required properties:
> >      * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
> >      * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
> >      * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
> > -    * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
> > +    * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
> > +                                 exynos3250 rtc (use "samsung,s3c6410-rtc").
> >  - reg: physical base address of the controller and length of memory mapped
> >    region.
> >  - interrupts: Two interrupt numbers to the cpu should be specified. First
> > diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
> > index e3bfb11c6ef8..8d58b550e925 100644
> > --- a/arch/arm/boot/dts/exynos3250.dtsi
> > +++ b/arch/arm/boot/dts/exynos3250.dtsi
> > @@ -189,7 +189,7 @@
> >  		};
> >  
> >  		rtc: rtc@10070000 {
> > -			compatible = "samsung,exynos3250-rtc";
> > +			compatible = "samsung,s3c6410-rtc";
> >  			reg = <0x10070000 0x100>;
> >  			interrupts = <0 73 0>, <0 74 0>;
> >  			interrupt-parent = <&pmu_system_controller>;
> > diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
> > index 5caea996e090..186cb8465683 100644
> > --- a/arch/arm/boot/dts/exynos4415.dtsi
> > +++ b/arch/arm/boot/dts/exynos4415.dtsi
> > @@ -177,7 +177,7 @@
> >  		};
> >  
> >  		rtc: rtc@10070000 {
> > -			compatible = "samsung,exynos3250-rtc";
> > +			compatible = "samsung,s3c6410-rtc";
> >  			reg = <0x10070000 0x100>;
> >  			interrupts = <0 73 0>, <0 74 0>;
> >  			status = "disabled";
> > 
> 
> Looks good to me.
> 
> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
> 

Are you absolutely sure that the exynos3250 IP is the same as the
s3c6410 (I don't know much about the exynos family). The concern being
that if at one point you have an errata on one or ther other, you will
have to break the DT ABI by undoing this change.

Note that I'm fine with it, I'm just asking.

Regards,

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-31  0:31     ` Alexandre Belloni
@ 2015-03-31  0:47       ` Chanwoo Choi
  2015-03-31  8:12         ` Alexandre Belloni
  0 siblings, 1 reply; 15+ messages in thread
From: Chanwoo Choi @ 2015-03-31  0:47 UTC (permalink / raw)
  To: Alexandre Belloni
  Cc: Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Kyungmin Park

Hi,

On 03/31/2015 09:31 AM, Alexandre Belloni wrote:
> Hi,
> 
> On 31/03/2015 at 08:38:30 +0900, Chanwoo Choi wrote :
>>> diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
>>> index ab757b84daa7..ac2fcd6ff4b8 100644
>>> --- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
>>> +++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
>>> @@ -6,7 +6,8 @@ Required properties:
>>>      * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
>>>      * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
>>>      * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
>>> -    * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
>>> +    * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
>>> +                                 exynos3250 rtc (use "samsung,s3c6410-rtc").
>>>  - reg: physical base address of the controller and length of memory mapped
>>>    region.
>>>  - interrupts: Two interrupt numbers to the cpu should be specified. First
>>> diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
>>> index e3bfb11c6ef8..8d58b550e925 100644
>>> --- a/arch/arm/boot/dts/exynos3250.dtsi
>>> +++ b/arch/arm/boot/dts/exynos3250.dtsi
>>> @@ -189,7 +189,7 @@
>>>  		};
>>>  
>>>  		rtc: rtc@10070000 {
>>> -			compatible = "samsung,exynos3250-rtc";
>>> +			compatible = "samsung,s3c6410-rtc";
>>>  			reg = <0x10070000 0x100>;
>>>  			interrupts = <0 73 0>, <0 74 0>;
>>>  			interrupt-parent = <&pmu_system_controller>;
>>> diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
>>> index 5caea996e090..186cb8465683 100644
>>> --- a/arch/arm/boot/dts/exynos4415.dtsi
>>> +++ b/arch/arm/boot/dts/exynos4415.dtsi
>>> @@ -177,7 +177,7 @@
>>>  		};
>>>  
>>>  		rtc: rtc@10070000 {
>>> -			compatible = "samsung,exynos3250-rtc";
>>> +			compatible = "samsung,s3c6410-rtc";
>>>  			reg = <0x10070000 0x100>;
>>>  			interrupts = <0 73 0>, <0 74 0>;
>>>  			status = "disabled";
>>>
>>
>> Looks good to me.
>>
>> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
>>
> 
> Are you absolutely sure that the exynos3250 IP is the same as the
> s3c6410 (I don't know much about the exynos family). The concern being
> that if at one point you have an errata on one or ther other, you will
> have to break the DT ABI by undoing this change.
> 
> Note that I'm fine with it, I'm just asking.

I'm sure about exynos3250 RTC is same with S3C6410 RTC.
There was little different about that pevious S3C6410 RTC
don't consider to control the 'rtc_src' clk.


But, Javier's patch[1] add the '.needs_src_clk' to control the
'rtc_src' clk. After merged this patch, there is no different part between
Exynos3250 RTC and S3C6410 RTC.

[1] 8792f7772f4f (drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data)

Thanks,
Chanwoo Choi




^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-30 23:38   ` Chanwoo Choi
  2015-03-31  0:31     ` Alexandre Belloni
@ 2015-03-31  6:43     ` Javier Martinez Canillas
  2015-03-31  6:54       ` Kukjin Kim
  1 sibling, 1 reply; 15+ messages in thread
From: Javier Martinez Canillas @ 2015-03-31  6:43 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo, devicetree,
	Linux Kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Alexandre Belloni, Kyungmin Park

On Tue, Mar 31, 2015 at 1:38 AM, Chanwoo Choi <cw00.choi@samsung.com> wrote:
> On 03/31/2015 12:19 AM, Krzysztof Kozlowski wrote:
>> Mark "samsung,exynos3250-rtc" compatible as deprecated because it
>> duplicates the "samsung,s3c6410-rtc". Use "samsung,s3c6410-rtc" on
>> Exynos3250 and Exynos4415 boards.
>>
>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> ---
>>  Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 ++-
>>  arch/arm/boot/dts/exynos3250.dtsi                 | 2 +-
>>  arch/arm/boot/dts/exynos4415.dtsi                 | 2 +-
>>  3 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
>> index ab757b84daa7..ac2fcd6ff4b8 100644
>> --- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
>> +++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
>> @@ -6,7 +6,8 @@ Required properties:
>>      * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
>>      * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
>>      * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
>> -    * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
>> +    * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
>> +                                 exynos3250 rtc (use "samsung,s3c6410-rtc").
>>  - reg: physical base address of the controller and length of memory mapped
>>    region.
>>  - interrupts: Two interrupt numbers to the cpu should be specified. First
>> diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
>> index e3bfb11c6ef8..8d58b550e925 100644
>> --- a/arch/arm/boot/dts/exynos3250.dtsi
>> +++ b/arch/arm/boot/dts/exynos3250.dtsi
>> @@ -189,7 +189,7 @@
>>               };
>>
>>               rtc: rtc@10070000 {
>> -                     compatible = "samsung,exynos3250-rtc";
>> +                     compatible = "samsung,s3c6410-rtc";
>>                       reg = <0x10070000 0x100>;
>>                       interrupts = <0 73 0>, <0 74 0>;
>>                       interrupt-parent = <&pmu_system_controller>;
>> diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
>> index 5caea996e090..186cb8465683 100644
>> --- a/arch/arm/boot/dts/exynos4415.dtsi
>> +++ b/arch/arm/boot/dts/exynos4415.dtsi
>> @@ -177,7 +177,7 @@
>>               };
>>
>>               rtc: rtc@10070000 {
>> -                     compatible = "samsung,exynos3250-rtc";
>> +                     compatible = "samsung,s3c6410-rtc";
>>                       reg = <0x10070000 0x100>;
>>                       interrupts = <0 73 0>, <0 74 0>;
>>                       status = "disabled";
>>
>
> Looks good to me.
>
> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
>
> Thanks,
> Chanwoo Choi
> --

Looks good to me also.

Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>

Best regards,
Javier

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  2015-03-31  0:27   ` Alexandre Belloni
@ 2015-03-31  6:49     ` Javier Martinez Canillas
  2015-03-31  8:20       ` Alexandre Belloni
  0 siblings, 1 reply; 15+ messages in thread
From: Javier Martinez Canillas @ 2015-03-31  6:49 UTC (permalink / raw)
  To: Alexandre Belloni
  Cc: Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo, Chanwoo Choi,
	devicetree, Linux Kernel, linux-arm-kernel, linux-samsung-soc,
	rtc-linux, Kyungmin Park

Hello Alexandre,

On Tue, Mar 31, 2015 at 2:27 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> nitpick: I would prefer rtc: rtc-s3c instead of drivers/rtc/rtc-s3c.c
>

Yes but Krzysztof is following the convention used in drivers/rtc/
which I think is the correct thing to do even when it's different from
what is used all over the kernel.

> On 30/03/2015 at 17:19:32 +0200, Krzysztof Kozlowski wrote :
>> 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>
>
> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>

Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>

Best regards,
Javier

^ permalink raw reply	[flat|nested] 15+ messages in thread

* RE: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-31  6:43     ` Javier Martinez Canillas
@ 2015-03-31  6:54       ` Kukjin Kim
  0 siblings, 0 replies; 15+ messages in thread
From: Kukjin Kim @ 2015-03-31  6:54 UTC (permalink / raw)
  To: 'Javier Martinez Canillas', 'Chanwoo Choi'
  Cc: 'Krzysztof Kozlowski', 'Kukjin Kim',
	'Alessandro Zummo', devicetree, 'Linux Kernel',
	linux-arm-kernel, linux-samsung-soc, rtc-linux,
	'Alexandre Belloni', 'Kyungmin Park'

Javier Martinez Canillas wrote:
> 
> On Tue, Mar 31, 2015 at 1:38 AM, Chanwoo Choi <cw00.choi@samsung.com> wrote:
> > On 03/31/2015 12:19 AM, Krzysztof Kozlowski wrote:
> >> Mark "samsung,exynos3250-rtc" compatible as deprecated because it
> >> duplicates the "samsung,s3c6410-rtc". Use "samsung,s3c6410-rtc" on
> >> Exynos3250 and Exynos4415 boards.
> >>
> >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> >> ---
> >>  Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 ++-
> >>  arch/arm/boot/dts/exynos3250.dtsi                 | 2 +-
> >>  arch/arm/boot/dts/exynos4415.dtsi                 | 2 +-
> >>  3 files changed, 4 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> >> index ab757b84daa7..ac2fcd6ff4b8 100644
> >> --- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> >> +++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
> >> @@ -6,7 +6,8 @@ Required properties:
> >>      * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
> >>      * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
> >>      * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
> >> -    * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
> >> +    * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
> >> +                                 exynos3250 rtc (use "samsung,s3c6410-rtc").
> >>  - reg: physical base address of the controller and length of memory mapped
> >>    region.
> >>  - interrupts: Two interrupt numbers to the cpu should be specified. First
> >> diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
> >> index e3bfb11c6ef8..8d58b550e925 100644
> >> --- a/arch/arm/boot/dts/exynos3250.dtsi
> >> +++ b/arch/arm/boot/dts/exynos3250.dtsi
> >> @@ -189,7 +189,7 @@
> >>               };
> >>
> >>               rtc: rtc@10070000 {
> >> -                     compatible = "samsung,exynos3250-rtc";
> >> +                     compatible = "samsung,s3c6410-rtc";
> >>                       reg = <0x10070000 0x100>;
> >>                       interrupts = <0 73 0>, <0 74 0>;
> >>                       interrupt-parent = <&pmu_system_controller>;
> >> diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
> >> index 5caea996e090..186cb8465683 100644
> >> --- a/arch/arm/boot/dts/exynos4415.dtsi
> >> +++ b/arch/arm/boot/dts/exynos4415.dtsi
> >> @@ -177,7 +177,7 @@
> >>               };
> >>
> >>               rtc: rtc@10070000 {
> >> -                     compatible = "samsung,exynos3250-rtc";
> >> +                     compatible = "samsung,s3c6410-rtc";
> >>                       reg = <0x10070000 0x100>;
> >>                       interrupts = <0 73 0>, <0 74 0>;
> >>                       status = "disabled";
> >>
> >
> > Looks good to me.
> >
> > Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
> >
> > Thanks,
> > Chanwoo Choi
> > --
> 
> Looks good to me also.
> 
> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> 
Thanks, applied.

- Kukjin


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-31  0:47       ` Chanwoo Choi
@ 2015-03-31  8:12         ` Alexandre Belloni
  2015-03-31  8:56           ` [rtc-linux] " Krzysztof Kozlowski
  0 siblings, 1 reply; 15+ messages in thread
From: Alexandre Belloni @ 2015-03-31  8:12 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo, devicetree,
	linux-kernel, linux-arm-kernel, linux-samsung-soc, rtc-linux,
	Kyungmin Park

On 31/03/2015 at 09:47:15 +0900, Chanwoo Choi wrote :
> > Are you absolutely sure that the exynos3250 IP is the same as the
> > s3c6410 (I don't know much about the exynos family). The concern being
> > that if at one point you have an errata on one or ther other, you will
> > have to break the DT ABI by undoing this change.
> > 
> > Note that I'm fine with it, I'm just asking.
> 
> I'm sure about exynos3250 RTC is same with S3C6410 RTC.
> There was little different about that pevious S3C6410 RTC
> don't consider to control the 'rtc_src' clk.
> 
> 
> But, Javier's patch[1] add the '.needs_src_clk' to control the
> 'rtc_src' clk. After merged this patch, there is no different part between
> Exynos3250 RTC and S3C6410 RTC.
> 
> [1] 8792f7772f4f (drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data)
> 

Yes, I saw that the software was handling both the same way, I was
asking about the hardware side.


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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  2015-03-31  6:49     ` Javier Martinez Canillas
@ 2015-03-31  8:20       ` Alexandre Belloni
  2015-03-31  9:00         ` [rtc-linux] " Krzysztof Kozlowski
  0 siblings, 1 reply; 15+ messages in thread
From: Alexandre Belloni @ 2015-03-31  8:20 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo, Chanwoo Choi,
	devicetree, Linux Kernel, linux-arm-kernel, linux-samsung-soc,
	rtc-linux, Kyungmin Park

Hi,

On 31/03/2015 at 08:49:39 +0200, Javier Martinez Canillas wrote :
> Hello Alexandre,
> 
> On Tue, Mar 31, 2015 at 2:27 AM, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> wrote:
> > nitpick: I would prefer rtc: rtc-s3c instead of drivers/rtc/rtc-s3c.c
> >
> 
> Yes but Krzysztof is following the convention used in drivers/rtc/
> which I think is the correct thing to do even when it's different from
> what is used all over the kernel.
> 

Having a look at the git history, the first and most used prefix is
actually 'rtc:' at some point, this started to change to 'drivers/rtc/'.
We should probably start to get back to 'rtc:', like most subsystems.


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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [rtc-linux] Re: [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc
  2015-03-31  8:12         ` Alexandre Belloni
@ 2015-03-31  8:56           ` Krzysztof Kozlowski
  0 siblings, 0 replies; 15+ messages in thread
From: Krzysztof Kozlowski @ 2015-03-31  8:56 UTC (permalink / raw)
  To: rtc-linux
  Cc: Chanwoo Choi, Krzysztof Kozlowski, Kukjin Kim, Alessandro Zummo,
	devicetree, linux-kernel, linux-arm-kernel, linux-samsung-soc,
	Kyungmin Park

2015-03-31 10:12 GMT+02:00 Alexandre Belloni
<alexandre.belloni@free-electrons.com>:
> On 31/03/2015 at 09:47:15 +0900, Chanwoo Choi wrote :
>> > Are you absolutely sure that the exynos3250 IP is the same as the
>> > s3c6410 (I don't know much about the exynos family). The concern being
>> > that if at one point you have an errata on one or ther other, you will
>> > have to break the DT ABI by undoing this change.
>> >
>> > Note that I'm fine with it, I'm just asking.
>>
>> I'm sure about exynos3250 RTC is same with S3C6410 RTC.
>> There was little different about that pevious S3C6410 RTC
>> don't consider to control the 'rtc_src' clk.
>>
>>
>> But, Javier's patch[1] add the '.needs_src_clk' to control the
>> 'rtc_src' clk. After merged this patch, there is no different part between
>> Exynos3250 RTC and S3C6410 RTC.
>>
>> [1] 8792f7772f4f (drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data)
>>
>
> Yes, I saw that the software was handling both the same way, I was
> asking about the hardware side.

The hardware is exactly the same. Or maybe I should say: I could not
find any differences.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [rtc-linux] Re: [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410
  2015-03-31  8:20       ` Alexandre Belloni
@ 2015-03-31  9:00         ` Krzysztof Kozlowski
  0 siblings, 0 replies; 15+ messages in thread
From: Krzysztof Kozlowski @ 2015-03-31  9:00 UTC (permalink / raw)
  To: rtc-linux
  Cc: Javier Martinez Canillas, Krzysztof Kozlowski, Kukjin Kim,
	Alessandro Zummo, Chanwoo Choi, devicetree, Linux Kernel,
	linux-arm-kernel, linux-samsung-soc, Kyungmin Park

2015-03-31 10:20 GMT+02:00 Alexandre Belloni
<alexandre.belloni@free-electrons.com>:
> Hi,
>
> On 31/03/2015 at 08:49:39 +0200, Javier Martinez Canillas wrote :
>> Hello Alexandre,
>>
>> On Tue, Mar 31, 2015 at 2:27 AM, Alexandre Belloni
>> <alexandre.belloni@free-electrons.com> wrote:
>> > nitpick: I would prefer rtc: rtc-s3c instead of drivers/rtc/rtc-s3c.c
>> >
>>
>> Yes but Krzysztof is following the convention used in drivers/rtc/
>> which I think is the correct thing to do even when it's different from
>> what is used all over the kernel.
>>
>
> Having a look at the git history, the first and most used prefix is
> actually 'rtc:' at some point, this started to change to 'drivers/rtc/'.
> We should probably start to get back to 'rtc:', like most subsystems.

Yes, I used "rtc: driver_name:" before but I saw that Andrew changes
them to full path when he picks the patch. So this time I wanted to
reduce the overhead for him... Anyway I'll stick to one format ("rtc:
rtc-s3c:") as you proposed.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2015-03-31  9:00 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-30 15:19 [PATCH 0/2] ARM: EXYNOS: Minor S3C RTC cleanups Krzysztof Kozlowski
2015-03-30 15:19 ` [PATCH 1/2] drivers/rtc/rtc-s3c.c: Integrate Exynos3250 into S3C6410 Krzysztof Kozlowski
2015-03-30 23:37   ` Chanwoo Choi
2015-03-31  0:27   ` Alexandre Belloni
2015-03-31  6:49     ` Javier Martinez Canillas
2015-03-31  8:20       ` Alexandre Belloni
2015-03-31  9:00         ` [rtc-linux] " Krzysztof Kozlowski
2015-03-30 15:19 ` [PATCH 2/2] ARM: dts: s3c-rtc: Use s3c6410-rtc instead of exynos3250-rtc Krzysztof Kozlowski
2015-03-30 23:38   ` Chanwoo Choi
2015-03-31  0:31     ` Alexandre Belloni
2015-03-31  0:47       ` Chanwoo Choi
2015-03-31  8:12         ` Alexandre Belloni
2015-03-31  8:56           ` [rtc-linux] " Krzysztof Kozlowski
2015-03-31  6:43     ` Javier Martinez Canillas
2015-03-31  6:54       ` Kukjin Kim

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).