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/imx6dl-riotboard.dts | |
| 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/imx6dl-riotboard.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-riotboard.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts index 43cb3fd76be7..5111f5170d53 100644 --- a/arch/arm/boot/dts/imx6dl-riotboard.dts +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts @@ -305,8 +305,8 @@ &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; - cd-gpios = <&gpio1 4 0>; - wp-gpios = <&gpio1 2 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay"; }; @@ -314,8 +314,8 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 0>; - wp-gpios = <&gpio7 1 0>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay"; }; |
