Message ID | 1384768189-2839-4-git-send-email-l.krishna@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Leela Krishna, On Mon, Nov 18, 2013 at 1:49 AM, Leela Krishna Amudala <l.krishna@samsung.com> 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> > Reviewed-by: Tomasz Figa <t.figa@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(-) I've got this locally running in our tree <https://chromium-review.googlesource.com/#/c/177933/> based on your patch. Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> -Doug -- 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>; + }; };