| Message ID | 20200718052950.3707-1-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 2fa17dd09533d5d83201be3229a28c1010a8ea3e |
| Headers | show |
| Series | arm64: dts: meson: misc fixups for w400 dtsi | expand |
Christian Hewitt <christianshewitt@gmail.com> writes: > 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. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> This could use a Fixes tag so it can be backported to stable Kevin
> On 21 Jul 2020, at 2:24 am, Kevin Hilman <khilman@baylibre.com> wrote: > > Christian Hewitt <christianshewitt@gmail.com> writes: > >> 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. >> >> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > > This could use a Fixes tag so it can be backported to stable > > Kevin Okay, I will send v2 with a fixes tag.
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"; }; };
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. Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)