ARM: dts: update watchdog device nodes for exynos5250 and exynos5420

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>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 258dca441f36c9991152ab75403a2f4056699349..79d0608d6dcc44ae895251086a665afcde2cf2e9 100644 (file)
--- 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 a55a5e872efa22622882d7479bdfe7b7ee4e8ecc..a76a1895b87d92e6bec219dbe24c0f9faf77b752 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -172,9 +172,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_system_controller>;
        };
 
        g2d@10850000 {

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 078b6ffd0c7f1f07b04184b0b3b7f74b7f0c18dd..9c834cc2ad79253f1998ea895368592f5c0dd6bd 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -657,4 +657,13 @@
                clocks = <&clock 319>, <&clock 318>;
                clock-names = "tmu_apbif", "tmu_triminfo_apbif";
        };
+
+        watchdog@101D0000 {
+               compatible = "samsung,exynos5420-wdt";
+               reg = <0x101D0000 0x100>;
+               interrupts = <0 42 0>;
+               clocks = <&clock 316>;
+               clock-names = "watchdog";
+               samsung,syscon-phandle = <&pmu_system_controller>;
+        };
 };