July 2022 - U-Boot

[PATCH] cmd: ti: ddr3: correct minor spelling mistake in Ti DDR3
by Ramin Zaghi 25 Jul '22

25 Jul '22

Hi I've searched a little to find a document that explains how to contribute to U-Boot. But couldn't find one. I hope this is the right way and who do I CC !? From f6cdf2ac9fe6ade663aa7a4ff1b2d1ac38fc2704 Mon Sep 17 00:00:00 2001 From: Ramin Zaghi <rzaghi(a)visualSilicon.com> Date: Fri, 8 Jul 2022 09:00:58 +0100 Subject: [PATCH] cmd: ti: ddr3: correct minor spelling mistake in Ti DDR3 command. Just a spelling mistake. Signed-off-by: Ramin Zaghi <rzaghi(a)visualSilicon.com> --- cmd/ti/ddr3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c index be937a7531d04ae64a1fdb716de8d2164c7fb36b..aaaedfe9735e337f1db4c9f2ce242303157d00c8 100644 --- a/cmd/ti/ddr3.c +++ b/cmd/ti/ddr3.c @@ -286,7 +286,7 @@ static int do_ddr_test(struct cmd_tbl *cmdtp, if ((argc == 4) && (strncmp(argv[1], "ecc_err", 8) == 0)) { if (!is_ecc_enabled()) { - puts("ECC not enabled. Please Enable ECC any try again\n"); + puts("ECC not enabled. Please Enable ECC and try again\n"); return CMD_RET_FAILURE; } -- 2.33.1

2 2

[PATCH] phy: ti: j721e-wiz: use OF data for device specific data
by Matt Ranostay 25 Jul '22

25 Jul '22

Move device specific data into OF data structure so it is easier to maintain and we can get rid of if statements. Based on: https://lore.kernel.org/linux-phy/20220526064121.27625-1-rogerq@kernel.org/… Cc: Roger Quadros <rogerq(a)kernel.org> Signed-off-by: Matt Ranostay <mranostay(a)ti.com> --- drivers/phy/ti/phy-j721e-wiz.c | 88 +++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c index 686cdc6f7c..fb6b6cf3ff 100644 --- a/drivers/phy/ti/phy-j721e-wiz.c +++ b/drivers/phy/ti/phy-j721e-wiz.c @@ -221,6 +221,44 @@ enum wiz_type { AM64_WIZ_10G, }; +struct wiz_data { + enum wiz_type type; + const struct reg_field *pll0_refclk_mux_sel; + const struct reg_field *pll1_refclk_mux_sel; + const struct reg_field *refclk_dig_sel; + const struct reg_field *pma_cmn_refclk1_dig_div; + const struct wiz_clk_mux_sel *clk_mux_sel; + unsigned int clk_div_sel_num; +}; + +static const struct wiz_data j721e_16g_data = { + .type = J721E_WIZ_16G, + .pll0_refclk_mux_sel = &pll0_refclk_mux_sel, + .pll1_refclk_mux_sel = &pll1_refclk_mux_sel, + .refclk_dig_sel = &refclk_dig_sel_16g, + .pma_cmn_refclk1_dig_div = &pma_cmn_refclk1_dig_div, + .clk_mux_sel = clk_mux_sel_16g, + .clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_16G, +}; + +static const struct wiz_data j721e_10g_data = { + .type = J721E_WIZ_10G, + .pll0_refclk_mux_sel = &pll0_refclk_mux_sel, + .pll1_refclk_mux_sel = &pll1_refclk_mux_sel, + .refclk_dig_sel = &refclk_dig_sel_10g, + .clk_mux_sel = clk_mux_sel_10g, + .clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G, +}; + +static struct wiz_data am64_10g_data = { + .type = AM64_WIZ_10G, + .pll0_refclk_mux_sel = &pll0_refclk_mux_sel, + .pll1_refclk_mux_sel = &pll1_refclk_mux_sel, + .refclk_dig_sel = &refclk_dig_sel_10g, + .clk_mux_sel = clk_mux_sel_10g, + .clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G, +}; + #define WIZ_TYPEC_DIR_DEBOUNCE_MIN 100 /* ms */ #define WIZ_TYPEC_DIR_DEBOUNCE_MAX 1000 @@ -253,6 +291,7 @@ struct wiz { u32 lane_phy_type[WIZ_MAX_LANES]; struct clk *input_clks[WIZ_MAX_INPUT_CLOCKS]; unsigned int id; + const struct wiz_data *data; }; struct wiz_div_clk { @@ -667,7 +706,7 @@ static int wiz_regfield_init(struct wiz *wiz) struct regmap *regmap = wiz->regmap; int num_lanes = wiz->num_lanes; struct udevice *dev = wiz->dev; - enum wiz_type type; + const struct wiz_data *data = wiz->data; int i; wiz->por_en = devm_regmap_field_alloc(dev, regmap, por_en); @@ -704,36 +743,31 @@ static int wiz_regfield_init(struct wiz *wiz) return PTR_ERR(wiz->div_sel_field[CMN_REFCLK]); } - wiz->div_sel_field[CMN_REFCLK1] = - devm_regmap_field_alloc(dev, regmap, pma_cmn_refclk1_dig_div); - if (IS_ERR(wiz->div_sel_field[CMN_REFCLK1])) { - dev_err(dev, "PMA_CMN_REFCLK1_DIG_DIV reg field init failed\n"); - return PTR_ERR(wiz->div_sel_field[CMN_REFCLK1]); + if (data->pma_cmn_refclk1_dig_div) { + wiz->div_sel_field[CMN_REFCLK1] = + devm_regmap_field_alloc(dev, regmap, *data->pma_cmn_refclk1_dig_div); + if (IS_ERR(wiz->div_sel_field[CMN_REFCLK1])) { + dev_err(dev, "PMA_CMN_REFCLK1_DIG_DIV reg field init failed\n"); + return PTR_ERR(wiz->div_sel_field[CMN_REFCLK1]); + } } wiz->mux_sel_field[PLL0_REFCLK] = - devm_regmap_field_alloc(dev, regmap, pll0_refclk_mux_sel); + devm_regmap_field_alloc(dev, regmap, *data->pll0_refclk_mux_sel); if (IS_ERR(wiz->mux_sel_field[PLL0_REFCLK])) { dev_err(dev, "PLL0_REFCLK_SEL reg field init failed\n"); return PTR_ERR(wiz->mux_sel_field[PLL0_REFCLK]); } wiz->mux_sel_field[PLL1_REFCLK] = - devm_regmap_field_alloc(dev, regmap, pll1_refclk_mux_sel); + devm_regmap_field_alloc(dev, regmap, *data->pll1_refclk_mux_sel); if (IS_ERR(wiz->mux_sel_field[PLL1_REFCLK])) { dev_err(dev, "PLL1_REFCLK_SEL reg field init failed\n"); return PTR_ERR(wiz->mux_sel_field[PLL1_REFCLK]); } - type = dev_get_driver_data(dev); - if (type == J721E_WIZ_10G || type == AM64_WIZ_10G) - wiz->mux_sel_field[REFCLK_DIG] = - devm_regmap_field_alloc(dev, regmap, - refclk_dig_sel_10g); - else - wiz->mux_sel_field[REFCLK_DIG] = - devm_regmap_field_alloc(dev, regmap, - refclk_dig_sel_16g); + wiz->mux_sel_field[REFCLK_DIG] = + devm_regmap_field_alloc(dev, regmap, *data->refclk_dig_sel); if (IS_ERR(wiz->mux_sel_field[REFCLK_DIG])) { dev_err(dev, "REFCLK_DIG_SEL reg field init failed\n"); return PTR_ERR(wiz->mux_sel_field[REFCLK_DIG]); @@ -1059,14 +1093,12 @@ static int j721e_wiz_probe(struct udevice *dev) wiz->num_lanes = num_lanes; wiz->dev = dev; wiz->clk_div_sel = clk_div_sel; - wiz->type = dev_get_driver_data(dev); - if (wiz->type == J721E_WIZ_10G || wiz->type == AM64_WIZ_10G) { - wiz->clk_mux_sel = clk_mux_sel_10g; - wiz->clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G; - } else { - wiz->clk_mux_sel = clk_mux_sel_16g; - wiz->clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_16G; - } + + wiz->data = (struct wiz_data *)dev_get_driver_data(dev); + wiz->type = wiz->data->type; + + wiz->clk_mux_sel = (struct wiz_clk_mux_sel *)wiz->data->clk_mux_sel; + wiz->clk_div_sel_num = wiz->data->clk_div_sel_num; rc = wiz_get_lane_phy_types(dev, wiz); if (rc) { @@ -1133,13 +1165,13 @@ static int j721e_wiz_remove(struct udevice *dev) static const struct udevice_id j721e_wiz_ids[] = { { - .compatible = "ti,j721e-wiz-16g", .data = J721E_WIZ_16G, + .compatible = "ti,j721e-wiz-16g", .data = (ulong)&j721e_16g_data, }, { - .compatible = "ti,j721e-wiz-10g", .data = J721E_WIZ_10G, + .compatible = "ti,j721e-wiz-10g", .data = (ulong)&j721e_10g_data, }, { - .compatible = "ti,am64-wiz-10g", .data = AM64_WIZ_10G, + .compatible = "ti,am64-wiz-10g", .data = (ulong)&am64_10g_data, }, {} }; -- 2.36.1

2 1

[PATCH v1 0/3] AM62x ESM support
by Julien Panis 25 Jul '22

25 Jul '22

[ERRATUM] Patch sent previously with wrong subject prefix. I am sorry. This patch series adds support for AM62x ESM (Error Signaling Modules). The Error Signaling Module (ESM) aggregates events and errors from throughout the device into one location. It can signal interrupts to a processor to deal with an event, and manipulate an error pin to signal an external hardware that an error has occurred. Therefore an external controller is able to reset the device. Two ESM can be used : one for main domain devices and another one for MCU domain devices. Event outputs generated by main ESM can be routed to MCU ESM as inputs, and trigger MCU ESM generating its event outputs. Following are required in defconfig: CONFIG_ESM_K3=y CONFIG_SPL_MISC=y CONFIG_SPL_DRIVERS_MISC=y Julien Panis (3): arm64: dts: k3-am625-r5: Add support for ESM devices arm64: mach-k3: am625_init: Probe ESM nodes configs: am62x_evm_r5: Add support for ESM arch/arm/dts/k3-am625-r5-sk.dts | 16 +++++++++++++ arch/arm/mach-k3/am625_init.c | 23 +++++++++++++++++++ arch/arm/mach-k3/include/mach/am62_hardware.h | 3 +++ configs/am62x_evm_r5_defconfig | 3 +++ 4 files changed, 45 insertions(+) -- 2.25.1

2 6

[PATCH 1/2] iommu: Add M2 support to Apple DART driver
by Janne Grunau 25 Jul '22

25 Jul '22

"apple,t8112-dart" uses an incompatible register interface but still offers the same functionality. This DART is found on the M2 and M1 Pro/Max/Ultra SoCs. Signed-off-by: Janne Grunau <j(a)jannau.net> --- drivers/iommu/apple_dart.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/apple_dart.c b/drivers/iommu/apple_dart.c index f2e170096072..2faacb8f3b6f 100644 --- a/drivers/iommu/apple_dart.c +++ b/drivers/iommu/apple_dart.c @@ -24,6 +24,12 @@ #define DART_TTBR_VALID BIT(31) #define DART_TTBR_SHIFT 12 +#define DART_T8110_TCR(sid) (0x1000 + 4 * (sid)) +#define DART_T8110_TCR_BYPASS_DAPF BIT(2) +#define DART_T8110_TCR_BYPASS_DART BIT(1) +#define DART_T8110_TCR_TRANSLATE_ENABLE BIT(0) +#define DART_T8110_TTBR(sid) (0x1400 + 4 * (sid)) + static int apple_dart_probe(struct udevice *dev) { void *base; @@ -34,7 +40,16 @@ static int apple_dart_probe(struct udevice *dev) return -EINVAL; u32 params2 = readl(base + DART_PARAMS2); - if (params2 & DART_PARAMS2_BYPASS_SUPPORT) { + if (!(params2 & DART_PARAMS2_BYPASS_SUPPORT)) + return 0; + + if (device_is_compatible(dev, "apple,t8112-dart")) { + for (sid = 0; sid < 256; sid++) { + writel(DART_T8110_TCR_BYPASS_DART | DART_T8110_TCR_BYPASS_DAPF, + base + DART_T8110_TCR(sid)); + writel(0, base + DART_T8110_TTBR(sid)); + } + } else { for (sid = 0; sid < 16; sid++) { writel(DART_TCR_BYPASS_DART | DART_TCR_BYPASS_DAPF, base + DART_TCR(sid)); @@ -49,6 +64,7 @@ static int apple_dart_probe(struct udevice *dev) static const struct udevice_id apple_dart_ids[] = { { .compatible = "apple,t8103-dart" }, { .compatible = "apple,t6000-dart" }, + { .compatible = "apple,t8112-dart" }, { /* sentinel */ } }; -- 2.35.1

3 5

[PATCH v2 0/6] imx8 ROM API cleanup
by Rasmus Villemoes 25 Jul '22

25 Jul '22

The meat of this is patch 3, and the main simplification it offers is patch 4. I have private board code where I will need to fetch some data over USB during bootstrapping, so having a more convenient API would be useful. But I do believe these patches make sense in their own right. v2: The original patches were accidentally not sent to the main U-Boot list, but only uboot-imx(a)nxp.com and a few individuals. Peng Fan replied with a R-b for the series, which I've included here for the first five patches. In patch 6, I missed a place to convert in the same file, so this is done here, but since the patch is not identical I've elided the R-b. Rasmus Villemoes (6): imx8: add hidden IMX8_ROMAPI Kconfig symbol imx8: sys_proto.h: change guard logic around ROM API imx8: add rom api wrappers imx8: use ROM API wrappers in spl_imx_romapi.c imx8m: soc.c: use rom_api_query_boot_infor() wrapper imx8ulp: soc.c: use rom_api_query_boot_infor() wrapper arch/arm/include/asm/mach-imx/sys_proto.h | 6 ++- arch/arm/mach-imx/Kconfig | 6 ++- arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/imx8m/soc.c | 5 +-- arch/arm/mach-imx/imx8ulp/soc.c | 10 +---- arch/arm/mach-imx/romapi.c | 30 +++++++++++++++ arch/arm/mach-imx/spl_imx_romapi.c | 47 ++++++----------------- 7 files changed, 55 insertions(+), 50 deletions(-) create mode 100644 arch/arm/mach-imx/romapi.c -- 2.31.1

2 12

[PATCH v1 5/8] toradex: common: Remove stale function declaration
by sbabic＠denx.de 25 Jul '22

25 Jul '22

> Remove stale show_boot_logo() declaration, not used anywhere. > Fixes: e6fd30dd9eef ("toradex: drop legacy show_boot_logo function and use splashscreen") > Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH] usb: ehci-mx6: Remove MX6Q_ARM2 related ifdefery
by Fabio Estevam 25 Jul '22

25 Jul '22

From: Fabio Estevam <festevam(a)denx.de> The imx6q arm2 board support has been removed from U-Boot as it did not get converted to DM. Remove the MX6Q_ARM2 related ifdefery in the driver. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- drivers/usb/host/ehci-mx6.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 060b02accc5c..e30449b55e47 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -272,12 +272,7 @@ static void usb_oc_config(struct usbnc_regs *usbnc, int index) { void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]); -#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2 - /* mx6qarm2 seems to required a different setting*/ - clrbits_le32(ctrl, UCTRL_OVER_CUR_POL); -#else setbits_le32(ctrl, UCTRL_OVER_CUR_POL); -#endif setbits_le32(ctrl, UCTRL_OVER_CUR_DIS); -- 2.25.1

3 2

[PATCH v1 2/8] toradex: common: Remove stale comments about modules availability
by sbabic＠denx.de 25 Jul '22

25 Jul '22

> Remove comment "not currently on sale" on specific SKUs, this > information does not belong to the code and will never be accurate. > Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH v1 7/8] toradex: tdx-cfg-block: Use official SKU names
by sbabic＠denx.de 25 Jul '22

25 Jul '22

> Up to now in the code we named Toradex SKUs in a slightly different way > compared to the official product name, start using the official names > from now on to avoid misunderstanding. > This has also the nice benefit of the string being shorter, allowing > to fit nicely in 80 columns even adding the product ID when printing > the hardware information. > Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH v6 0/7] Add support for FlexSPI Boot for i.MX8m
by Mamta Shukla 25 Jul '22

25 Jul '22

This series of patch adds support for generating FlexSPI Header file and booting from QSPI on i.MX8m. Changes in v2: -Add check for error in case open() for fspi_fd in imx8mkimage.c fails -Remove extra line in commit message -Remove extra line in imx8mm_evk_fspi_defconfig -New patch in series to add an entry for imx8mm_evk_fspi_defconfig in board/freescale/imx8mm_evk/MAINTAINERS -New patch in series to add instructions to build and boot from QSPI Flash Changes in v3: -Fix Checkpatch ERROR: code indent should use tabs where possible -Fix Checkpatch ERROR for trailing spaces Changes in v4: -Add condition for CONFIG_SYS_UBOOT_BASE for mmc/sd card build -Define QPSI0_AMBA_BASE in imx-regs.h since it is imx8mm specific Changes in v5: -Fix GCC warning: braces around scalar initializer -Remove __ASSEMBLY__ as it has been dropped in commit 5c86a8f7a191 ("imx: Don't define __ASSEMBLY__ in source files") -Sync config with commit e092e3250270 ("Prepare v2022.07") Changes in v6: -Fix GCC warning: braces around scalar initializer -Fix unused variable fpsi* warning while building for sd/emmc -Remove SPL_SEPARATE_BSS since it's removed in commit bfdb30559c76 ("configs: Resync with savedefconfig") -Add more detail to commit message to introduce imx8mm_evk_fspi_defconfig -Fix commit id used for sync: commit 36b661dc919d ("Merge branch 'next'") Mamta Shukla (7): tools: mkimage: Add support to generate FlexSPI Header for i.MX8m dts: imx8mm-uboot: Add support to pack FlexSPI Header using binman configs: Add config for enabling FSPI boot option for i.MX8m board: freescale: Add QSPI Boot support in spl for i.MX8m configs: imx8mm: Define CONFIG_SYS_UBOOT_BASE for i.MX8m board: freescale: Add entry for imx8mm_evk_fspi_defconfig doc: board: nxp: Add instructions to boot from QSPI arch/arm/dts/imx8mm-u-boot.dtsi | 20 +++ arch/arm/include/asm/arch-imx8m/imx-regs.h | 1 + board/freescale/imx8mm_evk/MAINTAINERS | 1 + .../imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg | 7 + board/freescale/imx8mm_evk/spl.c | 2 + configs/imx8mm_evk_fspi_defconfig | 123 ++++++++++++++++++ doc/board/nxp/imx8mm_evk.rst | 37 +++++- include/configs/imx8mm_evk.h | 9 ++ include/imximage.h | 38 ++++++ tools/Kconfig | 59 +++++++++ tools/imx8mimage.c | 81 +++++++++++- 11 files changed, 375 insertions(+), 3 deletions(-) create mode 100644 board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg create mode 100644 configs/imx8mm_evk_fspi_defconfig -- 2.25.1

2 14