diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
| commit | acd632eb64b6cd8e25583bb248c36aa937b8f021 (patch) | |
| tree | 993d276cbadb450fe8cf5e3c66d444a905d452e7 /arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | |
| parent | 4b0c53e9e1a2a785746b2d379a32cb70b4dbb2fd (diff) | |
| parent | 5542b2aa9eea3f2bb922029c8cc4b4346c4f6b1c (diff) | |
| download | talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.tar.gz talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.zip | |
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi index 3af16dfe417b..d7fe6672d00c 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi @@ -453,7 +453,7 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 0>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; }; @@ -461,7 +461,7 @@ &usdhc4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; - cd-gpios = <&gpio2 6 0>; + cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; }; |
