diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-07-30 18:03:16 +0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-08-24 07:44:11 +0400 |
commit | 03b276505435927b5c4f7d246557a991fbedad92 (patch) | |
tree | 18f3a41bd6db9d5cfb023b438c4e37284fefa11e /arch/arm/boot | |
parent | a9d1f92407a2114aff580a2e28803d64b4c437e0 (diff) | |
download | linux-03b276505435927b5c4f7d246557a991fbedad92.tar.xz |
ARM: dts: imx: Always enable the watchdog
Instead of enabling the watchdog in each individual dts file, select in
the SoC dtsi file instead.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx27-phytec-phycore.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx27.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51-babbage.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-ard.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-evk.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-qsb.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-smd.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 1 |
10 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts index 2b0ff60247a4..777caa33cd85 100644 --- a/arch/arm/boot/dts/imx27-phytec-phycore.dts +++ b/arch/arm/boot/dts/imx27-phytec-phycore.dts @@ -23,10 +23,6 @@ soc { aipi@10000000 { /* aipi */ - wdog@10002000 { - status = "okay"; - }; - serial@1000a000 { fsl,uart-has-rtscts; status = "okay"; diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index 5303ab680a34..3e54f1498841 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi @@ -62,7 +62,6 @@ compatible = "fsl,imx27-wdt", "fsl,imx21-wdt"; reg = <0x10002000 0x4000>; interrupts = <27>; - status = "disabled"; }; uart1: serial@1000a000 { diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index cd86177a3ea2..ce08d19f8414 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -169,10 +169,6 @@ }; }; - wdog@73f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@73fa8000 { compatible = "fsl,imx51-iomuxc-babbage"; reg = <0x73fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index aba28dc87fc8..140fd28de6ab 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -174,7 +174,6 @@ compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; reg = <0x73f98000 0x4000>; interrupts = <58>; - status = "disabled"; }; wdog@73f9c000 { /* WDOG2 */ diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts index da895e93a999..d356f10dd35a 100644 --- a/arch/arm/boot/dts/imx53-ard.dts +++ b/arch/arm/boot/dts/imx53-ard.dts @@ -31,10 +31,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-ard"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-evk.dts b/arch/arm/boot/dts/imx53-evk.dts index 9c798034675e..5d36dde14038 100644 --- a/arch/arm/boot/dts/imx53-evk.dts +++ b/arch/arm/boot/dts/imx53-evk.dts @@ -62,10 +62,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-evk"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts index 2d803a9a6949..3bfa6f147296 100644 --- a/arch/arm/boot/dts/imx53-qsb.dts +++ b/arch/arm/boot/dts/imx53-qsb.dts @@ -41,10 +41,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-qsb"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts index 08091029168e..45848afab1bd 100644 --- a/arch/arm/boot/dts/imx53-smd.dts +++ b/arch/arm/boot/dts/imx53-smd.dts @@ -77,10 +77,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-smd"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 0132078aca03..25b216e610f5 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -179,7 +179,6 @@ compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; reg = <0x53f98000 0x4000>; interrupts = <58>; - status = "disabled"; }; wdog@53f9c000 { /* WDOG2 */ diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index fd57079f71a9..a8cd96eed298 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -362,7 +362,6 @@ compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; reg = <0x020bc000 0x4000>; interrupts = <0 80 0x04>; - status = "disabled"; }; wdog@020c0000 { /* WDOG2 */ |