aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/exynos5.dtsi7
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi6
-rw-r--r--arch/arm/boot/dts/exynos5420.dtsi9
3 files changed, 14 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 258dca441f36..79d0608d6dcc 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -81,13 +81,6 @@
81 status = "disabled"; 81 status = "disabled";
82 }; 82 };
83 83
84 watchdog {
85 compatible = "samsung,s3c2410-wdt";
86 reg = <0x101D0000 0x100>;
87 interrupts = <0 42 0>;
88 status = "disabled";
89 };
90
91 fimd@14400000 { 84 fimd@14400000 {
92 compatible = "samsung,exynos5250-fimd"; 85 compatible = "samsung,exynos5250-fimd";
93 interrupt-parent = <&combiner>; 86 interrupt-parent = <&combiner>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index a55a5e872efa..a76a1895b87d 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -172,9 +172,13 @@
172 reg = <0x10040000 0x5000>; 172 reg = <0x10040000 0x5000>;
173 }; 173 };
174 174
175 watchdog { 175 watchdog@101D0000 {
176 compatible = "samsung,exynos5250-wdt";
177 reg = <0x101D0000 0x100>;
178 interrupts = <0 42 0>;
176 clocks = <&clock 336>; 179 clocks = <&clock 336>;
177 clock-names = "watchdog"; 180 clock-names = "watchdog";
181 samsung,syscon-phandle = <&pmu_system_controller>;
178 }; 182 };
179 183
180 g2d@10850000 { 184 g2d@10850000 {
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 078b6ffd0c7f..9c834cc2ad79 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -657,4 +657,13 @@
657 clocks = <&clock 319>, <&clock 318>; 657 clocks = <&clock 319>, <&clock 318>;
658 clock-names = "tmu_apbif", "tmu_triminfo_apbif"; 658 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
659 }; 659 };
660
661 watchdog@101D0000 {
662 compatible = "samsung,exynos5420-wdt";
663 reg = <0x101D0000 0x100>;
664 interrupts = <0 42 0>;
665 clocks = <&clock 316>;
666 clock-names = "watchdog";
667 samsung,syscon-phandle = <&pmu_system_controller>;
668 };
660}; 669};