Commit 03b27650 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent a9d1f924
...@@ -23,10 +23,6 @@ memory { ...@@ -23,10 +23,6 @@ memory {
soc { soc {
aipi@10000000 { /* aipi */ aipi@10000000 { /* aipi */
wdog@10002000 {
status = "okay";
};
serial@1000a000 { serial@1000a000 {
fsl,uart-has-rtscts; fsl,uart-has-rtscts;
status = "okay"; status = "okay";
......
...@@ -62,7 +62,6 @@ wdog@10002000 { ...@@ -62,7 +62,6 @@ wdog@10002000 {
compatible = "fsl,imx27-wdt", "fsl,imx21-wdt"; compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";
reg = <0x10002000 0x4000>; reg = <0x10002000 0x4000>;
interrupts = <27>; interrupts = <27>;
status = "disabled";
}; };
uart1: serial@1000a000 { uart1: serial@1000a000 {
......
...@@ -169,10 +169,6 @@ ssi2: ssi@70014000 { ...@@ -169,10 +169,6 @@ ssi2: ssi@70014000 {
}; };
}; };
wdog@73f98000 { /* WDOG1 */
status = "okay";
};
iomuxc@73fa8000 { iomuxc@73fa8000 {
compatible = "fsl,imx51-iomuxc-babbage"; compatible = "fsl,imx51-iomuxc-babbage";
reg = <0x73fa8000 0x4000>; reg = <0x73fa8000 0x4000>;
......
...@@ -174,7 +174,6 @@ wdog@73f98000 { /* WDOG1 */ ...@@ -174,7 +174,6 @@ wdog@73f98000 { /* WDOG1 */
compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
reg = <0x73f98000 0x4000>; reg = <0x73f98000 0x4000>;
interrupts = <58>; interrupts = <58>;
status = "disabled";
}; };
wdog@73f9c000 { /* WDOG2 */ wdog@73f9c000 { /* WDOG2 */
......
...@@ -31,10 +31,6 @@ esdhc@50004000 { /* ESDHC1 */ ...@@ -31,10 +31,6 @@ esdhc@50004000 { /* ESDHC1 */
}; };
}; };
wdog@53f98000 { /* WDOG1 */
status = "okay";
};
iomuxc@53fa8000 { iomuxc@53fa8000 {
compatible = "fsl,imx53-iomuxc-ard"; compatible = "fsl,imx53-iomuxc-ard";
reg = <0x53fa8000 0x4000>; reg = <0x53fa8000 0x4000>;
......
...@@ -62,10 +62,6 @@ esdhc@50020000 { /* ESDHC3 */ ...@@ -62,10 +62,6 @@ esdhc@50020000 { /* ESDHC3 */
}; };
}; };
wdog@53f98000 { /* WDOG1 */
status = "okay";
};
iomuxc@53fa8000 { iomuxc@53fa8000 {
compatible = "fsl,imx53-iomuxc-evk"; compatible = "fsl,imx53-iomuxc-evk";
reg = <0x53fa8000 0x4000>; reg = <0x53fa8000 0x4000>;
......
...@@ -41,10 +41,6 @@ esdhc@50020000 { /* ESDHC3 */ ...@@ -41,10 +41,6 @@ esdhc@50020000 { /* ESDHC3 */
}; };
}; };
wdog@53f98000 { /* WDOG1 */
status = "okay";
};
iomuxc@53fa8000 { iomuxc@53fa8000 {
compatible = "fsl,imx53-iomuxc-qsb"; compatible = "fsl,imx53-iomuxc-qsb";
reg = <0x53fa8000 0x4000>; reg = <0x53fa8000 0x4000>;
......
...@@ -77,10 +77,6 @@ esdhc@50020000 { /* ESDHC3 */ ...@@ -77,10 +77,6 @@ esdhc@50020000 { /* ESDHC3 */
}; };
}; };
wdog@53f98000 { /* WDOG1 */
status = "okay";
};
iomuxc@53fa8000 { iomuxc@53fa8000 {
compatible = "fsl,imx53-iomuxc-smd"; compatible = "fsl,imx53-iomuxc-smd";
reg = <0x53fa8000 0x4000>; reg = <0x53fa8000 0x4000>;
......
...@@ -179,7 +179,6 @@ wdog@53f98000 { /* WDOG1 */ ...@@ -179,7 +179,6 @@ wdog@53f98000 { /* WDOG1 */
compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
reg = <0x53f98000 0x4000>; reg = <0x53f98000 0x4000>;
interrupts = <58>; interrupts = <58>;
status = "disabled";
}; };
wdog@53f9c000 { /* WDOG2 */ wdog@53f9c000 { /* WDOG2 */
......
...@@ -362,7 +362,6 @@ wdog@020bc000 { /* WDOG1 */ ...@@ -362,7 +362,6 @@ wdog@020bc000 { /* WDOG1 */
compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
reg = <0x020bc000 0x4000>; reg = <0x020bc000 0x4000>;
interrupts = <0 80 0x04>; interrupts = <0 80 0x04>;
status = "disabled";
}; };
wdog@020c0000 { /* WDOG2 */ wdog@020c0000 { /* WDOG2 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment