From 1d6ab42f8867265fe6fac25e3a7436616d8c885b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 6 Apr 2021 19:51:07 +0200 Subject: [PATCH] Re-add patches missed with U-Boot 2021.04-rc4 upgrade (#1293) --- ...mic-enable-LDO2-vcc33_mipi-at-bootup.patch | 68 +++++++++++++++++++ ...001-HACK-mmc-meson-gx-limit-to-24MHz.patch | 27 ++++++++ 2 files changed, 95 insertions(+) create mode 100644 buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch create mode 100644 buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch diff --git a/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch new file mode 100644 index 000000000..a275f68ec --- /dev/null +++ b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch @@ -0,0 +1,68 @@ +From 68014c109ce917c2d3f6e204dd160dfc350ae7e7 Mon Sep 17 00:00:00 2001 +Message-Id: <68014c109ce917c2d3f6e204dd160dfc350ae7e7.1615892095.git.stefan@agner.ch> +In-Reply-To: <2f197db1961f09dd264770ef081280a44a1a4809.1615892095.git.stefan@agner.ch> +References: <2f197db1961f09dd264770ef081280a44a1a4809.1615892095.git.stefan@agner.ch> +From: Pascal Vizeli +Date: Fri, 24 Apr 2020 11:37:55 +0000 +Subject: [PATCH 2/2] pmic: enable LDO2 vcc33_mipi at bootup + +Signed-off-by: Pascal Vizeli +--- + board/rockchip/tinker_rk3288/tinker-rk3288.c | 37 ++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c +index f85209c649..6fa1bb0c66 100644 +--- a/board/rockchip/tinker_rk3288/tinker-rk3288.c ++++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + static int get_ethaddr_from_eeprom(u8 *addr) + { +@@ -48,3 +49,39 @@ int mmc_get_env_dev(void) + + return 1; + } ++ ++ ++#ifdef CONFIG_DM_PMIC ++static int rockchip_set_regulator_on(const char *name, uint uv) ++{ ++ struct udevice *dev; ++ int ret; ++ ++ ret = regulator_get_by_platname(name, &dev); ++ if (ret) { ++ debug("%s: Cannot find regulator %s\n", __func__, name); ++ return ret; ++ } ++ ret = regulator_set_value(dev, uv); ++ if (ret) { ++ debug("%s: Cannot set regulator %s\n", __func__, name); ++ return ret; ++ } ++ ret = regulator_set_enable(dev, 1); ++ if (ret) { ++ debug("%s: Cannot enable regulator %s\n", __func__, name); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++int power_init_board(void) ++{ ++ int ret = rockchip_set_regulator_on("vcc33_mipi", 3300000); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++#endif +-- +2.30.2 + diff --git a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch new file mode 100644 index 000000000..45100e950 --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -0,0 +1,27 @@ +From 1e68d462712e0d534059b09d41090c69d20807e0 Mon Sep 17 00:00:00 2001 +Message-Id: <1e68d462712e0d534059b09d41090c69d20807e0.1615894477.git.stefan@agner.ch> +From: Neil Armstrong +Date: Mon, 2 Sep 2019 15:42:04 +0200 +Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz + +Signed-off-by: Neil Armstrong +--- + 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.30.2 +