summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRobin Gong <yibin.gong@nxp.com>2017-05-25 13:59:21 +0800
committerAnson Huang <Anson.Huang@nxp.com>2017-06-09 22:22:48 +0800
commit4fe2dc984cf2ce7798b2a059b3a10e39e95f183a (patch)
treeafe9bfa9276ba26638c30b9fc2499e302f955511 /arch
parentafa966bed8b0329f332f05f3430e3b0670b6ea92 (diff)
MLK-14960-3: ARM: dts: imx6: remove 'fsl,wdog-reset'
Remove usless 'fsl,wdog-reset' property in dts on v4.9 Signed-off-by: Robin Gong <yibin.gong@nxp.com> (cherry picked from commit bfe33c0df6a7cba546fcc5b30609be277f499af2)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-fix-ldo.dts2
-rw-r--r--arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-interleave-android-ldo.dts2
-rw-r--r--arch/arm/boot/dts/imx6qp-sabresd-ldo.dts2
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts1
-rw-r--r--arch/arm/boot/dts/imx6ul-9x9-evk.dts1
-rw-r--r--arch/arm/boot/dts/imx6ull-9x9-evk.dts1
6 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-fix-ldo.dts b/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-fix-ldo.dts
index d6399d6ac71d..436a90d8045d 100644
--- a/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-fix-ldo.dts
+++ b/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-fix-ldo.dts
@@ -51,8 +51,6 @@
&gpc {
/* use ldo-enable, u-boot will check it and configure */
fsl,ldo-bypass = <0>;
- /* watchdog select of reset source */
- fsl,wdog-reset = <1>;
};
&wdog1 {
diff --git a/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-interleave-android-ldo.dts b/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-interleave-android-ldo.dts
index a26dd81c3902..65734218691c 100644
--- a/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-interleave-android-ldo.dts
+++ b/arch/arm/boot/dts/imx6dqscm-1gb-qwks-rev2-interleave-android-ldo.dts
@@ -51,8 +51,6 @@
&gpc {
/* use ldo-enable, u-boot will check it and configure */
fsl,ldo-bypass = <0>;
- /* watchdog select of reset source */
- fsl,wdog-reset = <1>;
};
&wdog1 {
diff --git a/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts b/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts
index d998c13c6e49..946fa2cf96bf 100644
--- a/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts
+++ b/arch/arm/boot/dts/imx6qp-sabresd-ldo.dts
@@ -11,8 +11,6 @@
&gpc {
/* use ldo-enable, u-boot will check it and configure */
fsl,ldo-bypass = <0>;
- /* watchdog select of reset source */
- fsl,wdog-reset = <1>;
};
&reg_arm {
diff --git a/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts b/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts
index 3385bb6aca11..94f5d86cb748 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts
@@ -186,7 +186,6 @@
fsl,cpu_pupscr_sw = <0x1>;
fsl,cpu_pdnscr_iso2sw = <0x1>;
fsl,cpu_pdnscr_iso = <0x1>;
- fsl,wdog-reset = <1>; /* watchdog select of reset source */
fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */
};
diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
index 0ca38a42453a..29896ea18303 100644
--- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
@@ -246,7 +246,6 @@
fsl,cpu_pupscr_sw = <0x0>;
fsl,cpu_pdnscr_iso2sw = <0x1>;
fsl,cpu_pdnscr_iso = <0x1>;
- fsl,wdog-reset = <1>; /* watchdog select of reset source */
fsl,ldo-bypass = <1>;
};
diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
index 05d3ee708b97..8f7c6f8926b6 100644
--- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
@@ -246,7 +246,6 @@
fsl,cpu_pupscr_sw = <0x0>;
fsl,cpu_pdnscr_iso2sw = <0x1>;
fsl,cpu_pdnscr_iso = <0x1>;
- fsl,wdog-reset = <1>; /* watchdog select of reset source */
fsl,ldo-bypass = <1>;
};