uboot-rockchip: fix boot issues with some SD cards

Some SD cards fail to boot with the NanoPi R2S

--Snip--
U-Boot TPL 2021.07-OpenWrt-r23596+6-7c43ced160 (Aug 21 2023 - 21:16:14)
DDR4, 333MHz
BW=32 Col=10 Bk=4 BG=2 CS0 Row=15 CS=1 Die BW=16 Size=1024MB
Trying to boot from BOOTROM
Returning to boot ROM...

U-Boot SPL 2021.07-OpenWrt-r23596+6-7c43ced160 (Aug 21 2023 - 21:16:14 +0000)
Trying to boot from MMC1
mmc_load_image_raw_sector: mmc block read error
SPL: failed to boot from all boot devices
--Snap--

Removing the UHS capabilities from the MMC controller makes them boot
again. Linux itself still uses the UHS capabilities.

Signed-off-by: David Bauer <mail@david-bauer.net>

diff --git a/package/boot/uboot-rockchip/patches/106-nanopi-r2s-sd-card-stability.patch b/package/boot/uboot-rockchip/patches/106-nanopi-r2s-sd-card-stability.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2c-rk3328/dt-plat.c b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2c-rk3328/dt-plat.c
index e5b330c9d9756b02fd6e1ff33039da288314c1af..f36a3c7f87095d4915cf4ddd21a98c14bc0e5eff 100644 (file)
--- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2c-rk3328/dt-plat.c
+++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2c-rk3328/dt-plat.c
@@ -99,10 +99,6 @@ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = {
        .pinctrl_0              = {0x47, 0x48, 0x49, 0x4a},
        .pinctrl_names          = "default",
        .reg                    = {0xff500000, 0x4000},
-       .sd_uhs_sdr104          = true,
-       .sd_uhs_sdr12           = true,
-       .sd_uhs_sdr25           = true,
-       .sd_uhs_sdr50           = true,
        .u_boot_spl_fifo_mode   = true,
        .vmmc_supply            = 0x4b,
        .vqmmc_supply           = 0x1e,

diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c
index e5b330c9d9756b02fd6e1ff33039da288314c1af..f36a3c7f87095d4915cf4ddd21a98c14bc0e5eff 100644 (file)
--- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c
+++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c
@@ -99,10 +99,6 @@ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = {
        .pinctrl_0              = {0x47, 0x48, 0x49, 0x4a},
        .pinctrl_names          = "default",
        .reg                    = {0xff500000, 0x4000},
-       .sd_uhs_sdr104          = true,
-       .sd_uhs_sdr12           = true,
-       .sd_uhs_sdr25           = true,
-       .sd_uhs_sdr50           = true,
        .u_boot_spl_fifo_mode   = true,
        .vmmc_supply            = 0x4b,
        .vqmmc_supply           = 0x1e,