aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2017-03-11 12:25:24 -0500
committerKrzysztof Kozlowski <krzk@kernel.org>2017-03-13 13:34:15 -0400
commitde44097b256146fb633f843b250f2515b838e031 (patch)
tree63e6bdf972ef73bf329f8733bc2e5fdd1ffe1da6
parentb5acdc38b8ceba1b642ba354be8845a8ac2b35d1 (diff)
ARM: dts: exynos: Enable watchdog on all Exynos4 boards
Watchdog module does not have external dependencies so it can be safely enabled in exynos4.dtsi thus making it available for all Exynos4-based boards. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--arch/arm/boot/dts/exynos4210-origen.dts4
-rw-r--r--arch/arm/boot/dts/exynos4210.dtsi1
-rw-r--r--arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos4412-odroid-common.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos4412-origen.dts4
-rw-r--r--arch/arm/boot/dts/exynos4412.dtsi1
6 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index a2c6a13fe67b..312650e2450f 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -328,7 +328,3 @@
328&tmu { 328&tmu {
329 status = "okay"; 329 status = "okay";
330}; 330};
331
332&watchdog {
333 status = "okay";
334};
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 8bff2253acca..9d51d4d62d94 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -125,7 +125,6 @@
125 interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; 125 interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
126 clocks = <&clock CLK_WDT>; 126 clocks = <&clock CLK_WDT>;
127 clock-names = "watchdog"; 127 clock-names = "watchdog";
128 status = "disabled";
129 }; 128 };
130 129
131 clock: clock-controller@10030000 { 130 clock: clock-controller@10030000 {
diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
index a36cd36a26b8..4cd62487bb16 100644
--- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
+++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
@@ -495,7 +495,3 @@
495 vtmu-supply = <&ldo16_reg>; 495 vtmu-supply = <&ldo16_reg>;
496 status = "okay"; 496 status = "okay";
497}; 497};
498
499&watchdog {
500 status = "okay";
501};
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 78f118cb73d4..0f1ff792fe44 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -555,7 +555,3 @@
555 vtmu-supply = <&ldo10_reg>; 555 vtmu-supply = <&ldo10_reg>;
556 status = "okay"; 556 status = "okay";
557}; 557};
558
559&watchdog {
560 status = "okay";
561};
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index a1ab6f94bb64..7a83e2df18a6 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -541,7 +541,3 @@
541&serial_3 { 541&serial_3 {
542 status = "okay"; 542 status = "okay";
543}; 543};
544
545&watchdog {
546 status = "okay";
547};
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 6f47988a1ab5..cc69466f17c0 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -222,7 +222,6 @@
222 clocks = <&clock CLK_WDT>; 222 clocks = <&clock CLK_WDT>;
223 clock-names = "watchdog"; 223 clock-names = "watchdog";
224 samsung,syscon-phandle = <&pmu_system_controller>; 224 samsung,syscon-phandle = <&pmu_system_controller>;
225 status = "disabled";
226 }; 225 };
227 226
228 adc: adc@126C0000 { 227 adc: adc@126C0000 {