| Message ID | 1427728773-29065-3-git-send-email-k.kozlowski@samsung.com |
|---|---|
| State | Not Applicable |
| Headers | show |
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
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,
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
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
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
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.
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
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";
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(-)