aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6dl-sabresd-ldo.dts1
-rw-r--r--arch/arm/boot/dts/imx6q-sabresd-ldo.dts1
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabresd.dtsi2
-rw-r--r--arch/arm/boot/dts/imx6sl-evk-ldo.dts1
-rw-r--r--arch/arm/boot/dts/imx6sl-evk.dts1
5 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts b/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
index 014a72172274..2b5d869421b3 100644
--- a/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
+++ b/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
@@ -16,6 +16,7 @@
16 16
17&gpc { 17&gpc {
18 fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */ 18 fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */
19 fsl,wdog-reset = <1>; /* watchdog select of reset source */
19 pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ 20 pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
20}; 21};
21 22
diff --git a/arch/arm/boot/dts/imx6q-sabresd-ldo.dts b/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
index c0a271bf3db9..e2744f29d8c2 100644
--- a/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
@@ -21,6 +21,7 @@
21 21
22&gpc { 22&gpc {
23 fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */ 23 fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */
24 fsl,wdog-reset = <1>; /* watchdog select of reset source */
24 pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ 25 pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
25}; 26};
26 27
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 1b50cdc9d435..b4965304eea0 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -267,6 +267,7 @@
267 fsl,cpu_pdnscr_iso2sw = <0x1>; 267 fsl,cpu_pdnscr_iso2sw = <0x1>;
268 fsl,cpu_pdnscr_iso = <0x1>; 268 fsl,cpu_pdnscr_iso = <0x1>;
269 fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */ 269 fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */
270 fsl,wdog-reset = <2>; /* watchdog select of reset source */
270 pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ 271 pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
271}; 272};
272 273
@@ -577,6 +578,7 @@
577 MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000 578 MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000
578 MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x80000000 579 MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x80000000
579 MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000 580 MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
581 MX6QDL_PAD_GPIO_1__WDOG2_B 0x80000000
580 >; 582 >;
581 }; 583 };
582 }; 584 };
diff --git a/arch/arm/boot/dts/imx6sl-evk-ldo.dts b/arch/arm/boot/dts/imx6sl-evk-ldo.dts
index 3a6818106cf1..9bbd6fbbfa97 100644
--- a/arch/arm/boot/dts/imx6sl-evk-ldo.dts
+++ b/arch/arm/boot/dts/imx6sl-evk-ldo.dts
@@ -16,6 +16,7 @@
16 16
17&gpc { 17&gpc {
18 fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */ 18 fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */
19 fsl,wdog-reset = <1>; /* watchdog select of reset source */
19 pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ 20 pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
20}; 21};
21 22
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 0095c6fc737d..3ed918fc390a 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -167,6 +167,7 @@
167 fsl,cpu_pdnscr_iso2sw = <0x1>; 167 fsl,cpu_pdnscr_iso2sw = <0x1>;
168 fsl,cpu_pdnscr_iso = <0x1>; 168 fsl,cpu_pdnscr_iso = <0x1>;
169 fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */ 169 fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */
170 fsl,wdog-reset = <1>; /* watchdog select of reset source */
170 pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ 171 pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
171}; 172};
172 173