diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:47:57 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:47:57 -0800 |
commit | 8b20b3796da06d8ada347c4eaf289c3127da155f (patch) | |
tree | cf5c1e1d8c177307df660f503743f8d5bfcd39a5 /arch/arm/boot/dts/imx6qdl-rex.dtsi | |
parent | 49bd04cb11e57c4cd4d2c00feca898537dd6db1f (diff) | |
parent | 419f2e2c67426866f3bdaab80caa6faa3a082ad6 (diff) |
Merge tag 'v4.1.13-rt15' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into v4.1/topic/rt
v4.1.13-rt15
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-rex.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-rex.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi index 394a4ace351a..a50356243888 100644 --- a/arch/arm/boot/dts/imx6qdl-rex.dtsi +++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi @@ -340,7 +340,7 @@ pinctrl-0 = <&pinctrl_usdhc2>; bus-width = <4>; cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; - wp-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -349,6 +349,6 @@ pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <4>; cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; - wp-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; status = "okay"; }; |