diff options
| author | Tom Rini <[email protected]> | 2025-09-22 08:22:22 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-09-22 08:22:22 -0600 |
| commit | df4c18067fe04d42c9929d6c3565f8ec002b41f2 (patch) | |
| tree | 0736a0f4ebb5336be0a1988ef4608a9f284f6722 /arch | |
| parent | d33b21b7e261691e8d6613a24cc9b0ececba3b01 (diff) | |
| parent | 1f95591cee01ea5e065b61d99a9853b164acbcf8 (diff) | |
Merge tag 'u-boot-imx-master-20250922' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/27685
- Fix Phycore i.MX93 voltage modes
- Call DM post init function for init_r phase on i.MX8ULP
- Fix ELE FW version print bug on i.MX8UL EVK.
- Fix LPCG number in ccm_reg structure on i.MX93
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-imx9/clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8ulp/soc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-imx9/clock.h b/arch/arm/include/asm/arch-imx9/clock.h index ffaf6b5f7d8..ddc84d2c9ed 100644 --- a/arch/arm/include/asm/arch-imx9/clock.h +++ b/arch/arm/include/asm/arch-imx9/clock.h @@ -111,7 +111,7 @@ struct ccm_reg { u32 reserved_3[192]; struct ccm_lpcg_oscpll clk_oscplls[19]; /* 0x5000 */ u32 reserved_4[2768]; - struct ccm_lpcg_oscpll clk_lpcgs[122]; /* 0x8000 */ + struct ccm_lpcg_oscpll clk_lpcgs[127]; /* 0x8000 */ }; struct ana_pll_reg_elem { diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index e85cb0dd252..7640f9b84da 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -804,6 +804,7 @@ int imx8ulp_dm_post_init(void) return 0; } EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_F, imx8ulp_dm_post_init); +EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_R, imx8ulp_dm_post_init); #if defined(CONFIG_XPL_BUILD) __weak void __noreturn jump_to_image(struct spl_image_info *spl_image) |