diff options
| author | Christian Hewitt <christianshewitt@gmail.com> | 2020-07-21 01:39:52 +0000 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2020-07-27 11:52:14 -0700 |
| commit | 2fa17dd09533d5d83201be3229a28c1010a8ea3e (patch) | |
| tree | 56009f313db9e24cb0683addffe1a07bbed14723 | |
| parent | 916a0edc43f03f86b13fbc9943e5dc936671ea6e (diff) | |
| download | linux-stable-2fa17dd09533d5d83201be3229a28c1010a8ea3e.tar.gz linux-stable-2fa17dd09533d5d83201be3229a28c1010a8ea3e.tar.bz2 linux-stable-2fa17dd09533d5d83201be3229a28c1010a8ea3e.zip | |
arm64: dts: meson: misc fixups for w400 dtsi
Current devices using the W400 dtsi show mmc tuning errors:
[12483.917391] mmc0: tuning execution failed: -5
[30535.551221] mmc0: tuning execution failed: -5
[35359.953671] mmc0: tuning execution failed: -5
[35561.875332] mmc0: tuning execution failed: -5
[61733.348709] mmc0: tuning execution failed: -5
Removing "sd-uhs-sdr50" from the SDIO node prevents this. We also add
keep-power-in-suspend to the SDIO node and fix an indentation.
Fixes: 3cb74db9b256 ("arm64: dts: meson: convert ugoos-am6 to common w400 dtsi")
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20200721013952.11635-1-christianshewitt@gmail.com
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi index 98b70d216a6f..2802ddbb83ac 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi @@ -336,9 +336,11 @@ bus-width = <4>; cap-sd-highspeed; - sd-uhs-sdr50; max-frequency = <100000000>; + /* WiFi firmware requires power to be kept while in suspend */ + keep-power-in-suspend; + non-removable; disable-wp; @@ -398,7 +400,7 @@ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; max-speed = <2000000>; clocks = <&wifi32k>; - clock-names = "lpo"; + clock-names = "lpo"; }; }; |