]>
Commit | Line | Data |
---|---|---|
7748c0ed SL |
1 | From 3a6d985ce6caf1dd3109755624104ae9a5faad7c Mon Sep 17 00:00:00 2001 |
2 | From: Martin Blumenstingl <martin.blumenstingl@googlemail.com> | |
3 | Date: Sat, 29 Dec 2018 13:57:09 +0100 | |
4 | Subject: ARM: dts: meson8b: odroidc1: mark the SD card detection GPIO | |
5 | active-low | |
6 | ||
7 | [ Upstream commit 3fb348e030319f20ebbde082a449d4bf8a96f2fd ] | |
8 | ||
9 | After commit 89a5e15bcba87d ("gpio/mmc/of: Respect polarity in the device | |
10 | tree") SD cards are not detected anymore. | |
11 | ||
12 | The CD GPIO is "active low" on Odroid-C1. The MMC dt-bindings specify: | |
13 | "[...] using the "cd-inverted" property means, that the CD line is active | |
14 | high, i.e. it is high, when a card is inserted". | |
15 | ||
16 | Fix the description of the SD card by marking it as GPIO_ACTIVE_LOW and | |
17 | drop the "cd-inverted" property. This makes the definition consistent | |
18 | with the existing dt-bindings and fixes the check whether an SD card is | |
19 | inserted. | |
20 | ||
21 | Fixes: e03efbce6bebf5 ("ARM: dts: meson8b-odroidc1: add microSD support") | |
22 | Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> | |
23 | Reviewed-by: Linus Walleij <linus.walleij@linaro.org> | |
24 | Tested-by: Anand Moon <linux.amoon@gmail.com> | |
25 | Signed-off-by: Kevin Hilman <khilman@baylibre.com> | |
26 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
27 | --- | |
28 | arch/arm/boot/dts/meson8b-odroidc1.dts | 3 +-- | |
29 | 1 file changed, 1 insertion(+), 2 deletions(-) | |
30 | ||
31 | diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts | |
32 | index 9e48936e2d8d..8fdeeffecbdb 100644 | |
33 | --- a/arch/arm/boot/dts/meson8b-odroidc1.dts | |
34 | +++ b/arch/arm/boot/dts/meson8b-odroidc1.dts | |
35 | @@ -171,8 +171,7 @@ | |
36 | cap-sd-highspeed; | |
37 | disable-wp; | |
38 | ||
39 | - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; | |
40 | - cd-inverted; | |
41 | + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; | |
42 | ||
43 | vmmc-supply = <&tflash_vdd>; | |
44 | vqmmc-supply = <&tf_io>; | |
45 | -- | |
46 | 2.19.1 | |
47 |