projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 941c5db0 SL |
1 | From 2ec8a39becb71c46011b205ea9f294ffbc1bec74 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Blumenstingl <martin.blumenstingl@googlemail.com> | |
| 3 | Date: Sat, 29 Dec 2018 13:57:11 +0100 | |
| 4 | Subject: ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO | |
| 5 | active-low | |
| 6 | ||
| 7 | [ Upstream commit 8615f5596335db0978cea593dcd0070dc5f8b116 ] | |
| 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 the MXIII-Plus. The MMC dt-bindings | |
| 13 | specify: "[...] using the "cd-inverted" property means, that the CD line | |
| 14 | is active 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: 35ee52bea66c74 ("ARM: dts: meson8m2: add support for the Tronsmart MXIII Plus") | |
| 22 | Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> | |
| 23 | Reviewed-by: Linus Walleij <linus.walleij@linaro.org> | |
| 24 | Signed-off-by: Kevin Hilman <khilman@baylibre.com> | |
| 25 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 26 | --- | |
| 27 | arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 3 +-- | |
| 28 | 1 file changed, 1 insertion(+), 2 deletions(-) | |
| 29 | ||
| 30 | diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts | |
| 31 | index f5853610b20b..6ac02beb5fa7 100644 | |
| 32 | --- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts | |
| 33 | +++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts | |
| 34 | @@ -206,8 +206,7 @@ | |
| 35 | cap-sd-highspeed; | |
| 36 | disable-wp; | |
| 37 | ||
| 38 | - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; | |
| 39 | - cd-inverted; | |
| 40 | + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; | |
| 41 | ||
| 42 | vmmc-supply = <&vcc_3v3>; | |
| 43 | }; | |
| 44 | -- | |
| 45 | 2.19.1 | |
| 46 |