diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 11:23:35 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 11:23:35 +0300 |
| commit | 5b929bd11df23922daf1be5d52731cc3900c1d79 (patch) | |
| tree | 105fa5987b03c9f4e0260a9eb04dff7bb3d16839 /arch/arm/boot/dts/imx53-voipac-bsb.dts | |
| parent | b2c51106c7581866c37ffc77c5d739f3d4b7cbc9 (diff) | |
| parent | 37868fe113ff2ba814b3b4eb12df214df555f8dc (diff) | |
| download | linux-5b929bd11df23922daf1be5d52731cc3900c1d79.tar.xz | |
Merge branch 'x86/urgent' into x86/asm, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx53-voipac-bsb.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx53-voipac-bsb.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx53-voipac-bsb.dts b/arch/arm/boot/dts/imx53-voipac-bsb.dts index c17d3ad6dba5..fc51b87ad208 100644 --- a/arch/arm/boot/dts/imx53-voipac-bsb.dts +++ b/arch/arm/boot/dts/imx53-voipac-bsb.dts @@ -119,8 +119,8 @@ &esdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>; - cd-gpios = <&gpio3 25 0>; - wp-gpios = <&gpio2 19 0>; + cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay"; }; |