提交 03b27650 编写于 作者: F Fabio Estevam 提交者: 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: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
上级 a9d1f924
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
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 @@ ...@@ -62,7 +62,6 @@
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 @@ ...@@ -169,10 +169,6 @@
}; };
}; };
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 @@ ...@@ -174,7 +174,6 @@
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 @@ ...@@ -31,10 +31,6 @@
}; };
}; };
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 @@ ...@@ -62,10 +62,6 @@
}; };
}; };
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 @@ ...@@ -41,10 +41,6 @@
}; };
}; };
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 @@ ...@@ -77,10 +77,6 @@
}; };
}; };
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 @@ ...@@ -179,7 +179,6 @@
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 @@ ...@@ -362,7 +362,6 @@
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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册