aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2015-06-11 12:52:14 +0800
committerZhang Rui <rui.zhang@intel.com>2015-06-11 12:52:14 +0800
commit111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch)
tree89b840115ccd753216ba0b26e587e52699b99310 /arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
parentintel powerclamp: support Knights Landing (diff)
parentMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff)
downloadlinux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz
linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 19cc269a08d4..1ce6133b67f5 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -31,6 +31,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio4 15 0>;
+ enable-active-high;
};
reg_usb_h1_vbus: regulator@1 {
@@ -40,6 +41,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 0 0>;
+ enable-active-high;
};
};