summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRobin Gong <yibin.gong@nxp.com>2017-05-24 18:19:27 +0800
committerAnson Huang <Anson.Huang@nxp.com>2017-06-09 22:22:47 +0800
commitafa966bed8b0329f332f05f3430e3b0670b6ea92 (patch)
treee6d8f52d49cc78b106fd876ddd657af2451fb2be /arch
parenta1b2a7661d81321ac92ad56b62e1d366802b99c1 (diff)
MLK-14960-2: ARM: dts: imx6/imx7: correct to "fsl,ext-reset-output"
align watchdog external reset output property with community instead of "fsl,wdog_b". Signed-off-by: Robin Gong <yibin.gong@nxp.com> (cherry picked from commit c07391d10d74a1c85a0978085a3ac0a761fb6410)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi1
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabresd.dtsi1
-rw-r--r--arch/arm/boot/dts/imx6sll-evk.dts2
-rw-r--r--arch/arm/boot/dts/imx6sx-14x14-arm2.dts2
-rw-r--r--arch/arm/boot/dts/imx6sx-19x19-arm2.dts2
-rw-r--r--arch/arm/boot/dts/imx6sx-sabreauto.dts2
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb.dtsi1
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-evk.dts1
-rw-r--r--arch/arm/boot/dts/imx6ul-9x9-evk.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-evk.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-9x9-evk.dts2
-rw-r--r--arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts2
-rw-r--r--arch/arm/boot/dts/imx7d-sdb.dts1
14 files changed, 9 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi b/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi
index bc74d32f451e..361fe62d067a 100644
--- a/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi
+++ b/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi
@@ -606,6 +606,5 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
fsl,ext-reset-output;
- fsl,wdog_b;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index e8861ab3cd2e..808ffe46b110 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -1075,6 +1075,5 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
fsl,ext-reset-output;
- fsl,wdog_b;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts
index f872693d0c9a..6fb3207bda4a 100644
--- a/arch/arm/boot/dts/imx6sll-evk.dts
+++ b/arch/arm/boot/dts/imx6sll-evk.dts
@@ -811,5 +811,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog1>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx6sx-14x14-arm2.dts b/arch/arm/boot/dts/imx6sx-14x14-arm2.dts
index 181ba5c2a098..3a04d28b0e80 100644
--- a/arch/arm/boot/dts/imx6sx-14x14-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-14x14-arm2.dts
@@ -556,7 +556,7 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
&iomuxc {
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index 9e94e7c8e1fc..44607424d5b8 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -535,7 +535,7 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
&iomuxc {
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 5006b3c4ad39..493afe6978bc 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -949,5 +949,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 212b54e6bc98..eaea8ff94cb6 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -697,7 +697,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
fsl,ext-reset-output;
- fsl,wdog_b;
};
&iomuxc {
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index a30e4c33b82e..da2ae89b3f00 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -440,7 +440,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
fsl,ext-reset-output;
- fsl,wdog_b;
};
&iomuxc {
diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
index 572eaa281cec..0ca38a42453a 100644
--- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
@@ -810,5 +810,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
index 82da3ec9318f..fdd27eb717a8 100644
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
@@ -1025,5 +1025,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk.dts b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
index ffab0fd736c9..cd2a07671d62 100644
--- a/arch/arm/boot/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
@@ -746,5 +746,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
index 750c6cbcac8f..05d3ee708b97 100644
--- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
@@ -810,5 +810,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index fd35dd08cbc8..feaf056c62d9 100644
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -1013,5 +1013,5 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
- fsl,wdog_b;
+ fsl,ext-reset-output;
};
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index d3e5ae9a8f9c..1f09a0e7b999 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -789,7 +789,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
fsl,ext-reset-output;
- fsl,wdog_b;
};
&gpmi {