From 0f0b3e5b63c7003eb189870c6fec9f26c9d52abe Mon Sep 17 00:00:00 2001 From: c0rnelius <43829819+pyavitz@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:50:48 -0400 Subject: [PATCH] Radxa Zero: `u-boot-v2023.07.02` (#5858) Update Das U-Boot to v2023.07.02 Patch: HACK: mmc: meson-gx: limit to 24MHz https://github.com/radxa/u-boot/commit/db6738fed924d7febb8bac927e30526f81408eeb In my testing the patch is required for stable boot on REV 1.51. It is not required on REV 1.4, but has no ill effects on boot. Signed-off-by: Patrick Yavitz Co-authored-by: Patrick Yavitz --- config/boards/radxa-zero.conf | 4 +-- ...001-HACK-mmc-meson-gx-limit-to-24MHz.patch | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch diff --git a/config/boards/radxa-zero.conf b/config/boards/radxa-zero.conf index 63a052d1fc..500a37e699 100644 --- a/config/boards/radxa-zero.conf +++ b/config/boards/radxa-zero.conf @@ -13,5 +13,5 @@ ASOUND_STATE="asound.state.radxa-zero" BOOT_FDT_FILE="amlogic/meson-g12a-radxa-zero.dtb" # Newer u-boot for the Zero -BOOTBRANCH_BOARD="tag:v2022.10" -BOOTPATCHDIR="v2022.10" +BOOTBRANCH_BOARD="tag:v2023.07.02" +BOOTPATCHDIR="v2023.07.02" diff --git a/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch new file mode 100644 index 0000000000..ce06690ad3 --- /dev/null +++ b/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -0,0 +1,26 @@ +From b55ab13244c8c175447fb1becdd25690e011b6c3 Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +Date: Fri, 28 Jul 2023 13:32:12 -0400 +Subject: [PATCH] HACK: mmc-meson-gx limit to 24MHz + +Signed-off-by: Patrick Yavitz +--- + drivers/mmc/meson_gx_mmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c +index fcf4f03d1e..6ded4b619b 100644 +--- a/drivers/mmc/meson_gx_mmc.c ++++ b/drivers/mmc/meson_gx_mmc.c +@@ -279,7 +279,7 @@ static int meson_mmc_probe(struct udevice *dev) + cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | + MMC_MODE_HS_52MHz | MMC_MODE_HS; + cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); +- cfg->f_max = 100000000; /* 100 MHz */ ++ cfg->f_max = SD_EMMC_CLKSRC_24M; + cfg->b_max = 511; /* max 512 - 1 blocks */ + cfg->name = dev->name; + +-- +2.39.2 +