clk: imx8mp: clock names and clock source fixes
Subsystems (3)
cover clk: imx8mp: clock names and clock source fixes
This series addresses few fixes for clock sub-system for i.MX8MP SOC.
One is dealing with incorrect names used, while the second one addresses root clock selection which has been apparently omitted during merge and caused the warning to be reported during boot.
Andrey Zhizhikin (2):
clk: imx8mp: fix root clock names for ecspi
clk: imx8mp: use usb_core_ref for usb_root_clk
drivers/clk/imx/clk-imx8mp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
base-commit: 3053b781465711fd05b88ab141b1f2b55a875516
Signature · 1 line
2.25.1
PATCH 1/2 clk: imx8mp: fix root clock names for ecspi
Root clock name contained underscore, which does not match to the actual clock name.
Correct the name to match what is present in the FDT.
--- drivers/clk/imx/clk-imx8mp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/imx/clk-imx8mp.c +3 -3
@@ -122,15 +122,15 @@ static const char *imx8mp_gic_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_p"sys_pll2_100m" ,"sys_pll1_800m" , "sys_pll2_500m", "clk_ext4", "audio_pll2_out" }; -static const char *imx8mp_ecspi1_sels[] = {"clock-osc_24m" ,"sys_pll2_200m" ,"sys_pll1_40m" , +static const char *imx8mp_ecspi1_sels[] = {"clock-osc-24m" ,"sys_pll2_200m" ,"sys_pll1_40m" ,"sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_250m" ,"audio_pll2_out" , }; -static const char *imx8mp_ecspi2_sels[] = {"clock-osc_24m" ,"sys_pll2_200m" ,"sys_pll1_40m" , +static const char *imx8mp_ecspi2_sels[] = {"clock-osc-24m" ,"sys_pll2_200m" ,"sys_pll1_40m" ,"sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_250m" ,"audio_pll2_out" , }; -static const char *imx8mp_ecspi3_sels[] = {"clock-osc_24m" ,"sys_pll2_200m" ,"sys_pll1_40m" , +static const char *imx8mp_ecspi3_sels[] = {"clock-osc-24m" ,"sys_pll2_200m" ,"sys_pll1_40m" ,"sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_250m" ,"audio_pll2_out" , };
Signature · 1 line
2.25.1
Re: [PATCH 1/2] clk: imx8mp: fix root clock names for ecspi
Quoted 11 lines · Andrey Zhizhikin
Root clock name contained underscore, which does not match to the actual clock name.
Correct the name to match what is present in the FDT.
Fixes 87f958810fcb ("clk: imx8mp: Add ECSPI clocks")Signed-off-by Andrey Zhizhikin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>Cc uboot-imx <[email protected]>
PATCH 1/2 clk: imx8mp: fix root clock names for ecspi
In reply to Andrey ZhizhikinQuoted 10 lines
Root clock name contained underscore, which does not match to the actual clock name.
Correct the name to match what is present in the FDT.Fixes 87f958810fcb ("clk: imx8mp: Add ECSPI clocks")Signed-off-by Andrey Zhizhikin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>Cc uboot-imx <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH 2/2 clk: imx8mp: use usb_core_ref for usb_root_clk
In reply to Andrey ZhizhikinUpstream commit 7a2c3be95a50 ("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIX clock") added usb_core_ref for USB Controller but never set it to be used as a clock source, using rather "osc_32k" instead.
This produces following boot log message:
"clk_register: failed to get osc_32k device (parent of usb_root_clk)"
Fix the USB controller clock source by using usb_core_ref instead of osc_32k.
--- drivers/clk/imx/clk-imx8mp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mp.c +1 -1
@@ -300,7 +300,7 @@ static int imx8mp_clk_probe(struct udevice *dev)clk_dm (IMX8MP_CLK_UART2_ROOT ,imx_clk_gate4 ("uart2_root_clk" ,"uart2" , base +0x44a0 ,0 ));clk_dm (IMX8MP_CLK_UART3_ROOT ,imx_clk_gate4 ("uart3_root_clk" ,"uart3" , base +0x44b0 ,0 ));clk_dm (IMX8MP_CLK_UART4_ROOT ,imx_clk_gate4 ("uart4_root_clk" ,"uart4" , base +0x44c0 ,0 )); -clk_dm (IMX8MP_CLK_USB_ROOT ,imx_clk_gate4 ("usb_root_clk" ,"osc_32k" , base +0x44d0 ,0 )); +clk_dm (IMX8MP_CLK_USB_ROOT ,imx_clk_gate4 ("usb_root_clk" ,"usb_core_ref" , base +0x44d0 ,0 ));clk_dm (IMX8MP_CLK_USB_PHY_ROOT ,imx_clk_gate4 ("usb_phy_root_clk" ,"usb_phy_ref" , base +0x44f0 ,0 ));clk_dm (IMX8MP_CLK_USDHC1_ROOT ,imx_clk_gate4 ("usdhc1_root_clk" ,"usdhc1" , base +0x4510 ,0 ));clk_dm (IMX8MP_CLK_USDHC2_ROOT ,imx_clk_gate4 ("usdhc2_root_clk" ,"usdhc2" , base +0x4520 ,0 ));
Signature · 1 line
2.25.1
Re: [PATCH 2/2] clk: imx8mp: use usb_core_ref for usb_root_clk
Quoted 7 lines · Andrey Zhizhikin
Upstream commit
7a2c3be95a50("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIX clock") addedusb_core_reffor USB Controller but never set it to be used as a clock source, using rather "osc_32k" instead.This produces following boot log message:
"clk_register: failed to getosc_32kdevice (parent ofusb_root_clk)"
Quoted 8 lines
Fix the USB controller clock source by using
usb_core_refinstead ofosc_32k.Fixes 7a2c3be95a50 ("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIX clock")Signed-off-by Andrey Zhizhikin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>
Re: [PATCH 2/2] clk: imx8mp: use usb_core_ref for usb_root_clk
In reply to Andrey ZhizhikinQuoted 45 lines · On Fri, Jun 3, 2022, 17:16 Andrey Zhizhikin <…
Upstream commit
7a2c3be95a50("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIX clock") addedusb_core_reffor USB Controller but never set it to be used as a clock source, using rather "osc_32k" instead.This produces following boot log message:
"clk_register: failed to getosc_32kdevice (parent ofusb_root_clk)"Fix the USB controller clock source by using
usb_core_refinstead ofosc_32k.Fixes 7a2c3be95a50 ("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIXclock")
Signed-off-by Andrey Zhizhikin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>--- drivers/clk/imx/clk-imx8mp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clk/imx/clk-imx8mp.c +0
-1@@ -300,7 +300,7 @@ static int imx8mp_clk_probe(struct udevice *dev)clk_dm (IMX8MP_CLK_UART2_ROOT ,imx_clk_gate4 ("uart2_root_clk" ,"uart2" , base +0x44a0 ,0 ));clk_dm (IMX8MP_CLK_UART3_ROOT ,imx_clk_gate4 ("uart3_root_clk" ,"uart3" , base +0x44b0 ,0 ));clk_dm (IMX8MP_CLK_UART4_ROOT ,imx_clk_gate4 ("uart4_root_clk" ,"uart4" , base +0x44c0 ,0 )); - clk_dm(IMX8MP_CLK_USB_ROOT, imx_clk_gate4("usb_root_clk","
osc_32k", base +0x44d0, 0));
+ clk_dm(IMX8MP_CLK_USB_ROOT, imx_clk_gate4("usb_root_clk","usb_core_ref", base + 0x44d0, 0)); clk_dm(IMX8MP_CLK_USB_PHY_ROOT, imx_clk_gate4("usb_phy_root_clk", "usb_phy_ref", base + 0x44f0, 0)); clk_dm(IMX8MP_CLK_USDHC1_ROOT, imx_clk_gate4("usdhc1_root_clk", "usdhc1", base + 0x4510, 0)); clk_dm(IMX8MP_CLK_USDHC2_ROOT, imx_clk_gate4("usdhc2_root_clk","usdhc2", base +
0x4520, 0));
--
2.25.1Reviewed-by Tommaso Merciai <[email protected]>
PATCH 2/2 clk: imx8mp: use usb_core_ref for usb_root_clk
In reply to Andrey ZhizhikinQuoted 7 lines
Upstream commit
7a2c3be95a50("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIX clock") addedusb_core_reffor USB Controller but never set it to be used as a clock source, using rather "osc_32k" instead. This produces following boot log message:
"clk_register: failed to getosc_32kdevice (parent ofusb_root_clk)" Fix the USB controller clock source by usingusb_core_refinstead ofosc_32k.
Quoted 6 lines
Fixes 7a2c3be95a50 ("clk: imx8mp: Fill in DWC3 USB, USB PHY, HSIOMIX clock")Signed-off-by Andrey Zhizhikin <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================