diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 11:10:05 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 11:10:05 -0700 |
commit | 6e64e22449023dc89dfb92c6f19d4c5b03f46889 (patch) | |
tree | c0099a75238a2cdcedf005956963329eee0aac75 /arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | |
parent | 4ad2adc98f113d6c21d7bd365cd45ba88d4f7470 (diff) | |
parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
download | blackbird-op-linux-6e64e22449023dc89dfb92c6f19d4c5b03f46889.tar.gz blackbird-op-linux-6e64e22449023dc89dfb92c6f19d4c5b03f46889.zip |
Merge 4.2-rc4 into staging-next
We want the iio and other fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-gw54xx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi index 4a8d97f47759..1afe3385e2d2 100644 --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi @@ -417,7 +417,7 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; }; |