| Message ID | 1384173897-16106-3-git-send-email-l.krishna@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Leela, On Monday 11 of November 2013 18:14:56 Leela Krishna Amudala wrote: > In Exynos5 series SoCs, PMU has registers to enable/disable mask/unmask > watchdog timer which is not the case with s3c series SoCs so, there is a > need to have different compatible names for watchdog to handle these pmu > registers access. > > Hence this patch removes watchdog node from Exynos5.dtsi common file and > make it separate by updating existing node in Exynos5250 and adding new node > to Exynos5420. This patch also makes the watchdog node enabled by default > > Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com> > --- > arch/arm/boot/dts/exynos5.dtsi | 7 ------- > arch/arm/boot/dts/exynos5250.dtsi | 6 +++++- > arch/arm/boot/dts/exynos5420.dtsi | 9 +++++++++ > 3 files changed, 14 insertions(+), 8 deletions(-) This patch should go as the last in this series, because otherwise it would change DTS files to use compatible values that are not yet supported. The patch itself is fine, so Reviewed-by: Tomasz Figa <t.figa@samsung.com> Best regards, Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tomasz, On Mon, Nov 11, 2013 at 6:36 PM, Tomasz Figa <tomasz.figa@gmail.com> wrote: > Hi Leela, > > On Monday 11 of November 2013 18:14:56 Leela Krishna Amudala wrote: >> In Exynos5 series SoCs, PMU has registers to enable/disable mask/unmask >> watchdog timer which is not the case with s3c series SoCs so, there is a >> need to have different compatible names for watchdog to handle these pmu >> registers access. >> >> Hence this patch removes watchdog node from Exynos5.dtsi common file and >> make it separate by updating existing node in Exynos5250 and adding new node >> to Exynos5420. This patch also makes the watchdog node enabled by default >> >> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com> >> --- >> arch/arm/boot/dts/exynos5.dtsi | 7 ------- >> arch/arm/boot/dts/exynos5250.dtsi | 6 +++++- >> arch/arm/boot/dts/exynos5420.dtsi | 9 +++++++++ >> 3 files changed, 14 insertions(+), 8 deletions(-) > > This patch should go as the last in this series, because otherwise it > would change DTS files to use compatible values that are not yet > supported. > Okay, will make it as last patch in the series Best Wishes, Leela Krishna > The patch itself is fine, so > > Reviewed-by: Tomasz Figa <t.figa@samsung.com> > > Best regards, > Tomasz > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index e52b038..f1fea28 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -81,13 +81,6 @@ status = "disabled"; }; - watchdog { - compatible = "samsung,s3c2410-wdt"; - reg = <0x101D0000 0x100>; - interrupts = <0 42 0>; - status = "disabled"; - }; - fimd@14400000 { compatible = "samsung,exynos5250-fimd"; interrupt-parent = <&combiner>; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 6056a83..69f6c6a 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -163,9 +163,13 @@ reg = <0x10040000 0x5000>; }; - watchdog { + watchdog@101D0000 { + compatible = "samsung,exynos5250-wdt"; + reg = <0x101D0000 0x100>; + interrupts = <0 42 0>; clocks = <&clock 336>; clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_syscon>; }; g2d@10850000 { diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 39ce15a..61764bb 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -374,4 +374,13 @@ compatible = "samsung,exynos5420-pmu", "syscon"; reg = <0x10040000 0x5000>; }; + + watchdog@101D0000 { + compatible = "samsung,exynos5420-wdt"; + reg = <0x101D0000 0x100>; + interrupts = <0 42 0>; + clocks = <&clock 316>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_syscon>; + }; };
In Exynos5 series SoCs, PMU has registers to enable/disable mask/unmask watchdog timer which is not the case with s3c series SoCs so, there is a need to have different compatible names for watchdog to handle these pmu registers access. Hence this patch removes watchdog node from Exynos5.dtsi common file and make it separate by updating existing node in Exynos5250 and adding new node to Exynos5420. This patch also makes the watchdog node enabled by default Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com> --- arch/arm/boot/dts/exynos5.dtsi | 7 ------- arch/arm/boot/dts/exynos5250.dtsi | 6 +++++- arch/arm/boot/dts/exynos5420.dtsi | 9 +++++++++ 3 files changed, 14 insertions(+), 8 deletions(-)