| From aea020c674b8858a21c645623ffba4dd00532aac Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 21 Jul 2020 01:59:50 +0000 |
| Subject: arm64: dts: meson: fix mmc0 tuning error on Khadas VIM3 |
| |
| From: Christian Hewitt <christianshewitt@gmail.com> |
| |
| [ Upstream commit f1bb924e8f5b50752a80fa5b48c43003680a7b64 ] |
| |
| Similar to other G12B devices using the W400 dtsi, I see reports of mmc0 |
| tuning errors on VIM3 after a few hours uptime: |
| |
| [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 |
| |
| I do not see the same on VIM3L, so remove sd-uhs-sdr50 from the common dtsi |
| to silence the error, then (re)add it to the VIM3L dts. |
| |
| Fixes: 4f26cc1c96c9 ("arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi") |
| Fixes: 700ab8d83927 ("arm64: dts: khadas-vim3: add support for the SM1 based VIM3L") |
| Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> |
| Signed-off-by: Kevin Hilman <khilman@baylibre.com> |
| Link: https://lore.kernel.org/r/20200721015950.11816-1-christianshewitt@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 1 - |
| arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 4 ++++ |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi |
| index 1ef1e3672b967..ff5ba85b7562e 100644 |
| --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi |
| +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi |
| @@ -270,7 +270,6 @@ &sd_emmc_a { |
| |
| bus-width = <4>; |
| cap-sd-highspeed; |
| - sd-uhs-sdr50; |
| max-frequency = <100000000>; |
| |
| non-removable; |
| diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts |
| index dbbf29a0dbf6d..026b21708b078 100644 |
| --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts |
| +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts |
| @@ -88,6 +88,10 @@ &pcie { |
| status = "okay"; |
| }; |
| |
| +&sd_emmc_a { |
| + sd-uhs-sdr50; |
| +}; |
| + |
| &usb { |
| phys = <&usb2_phy0>, <&usb2_phy1>; |
| phy-names = "usb2-phy0", "usb2-phy1"; |
| -- |
| 2.25.1 |
| |