Message ID | 20240730073003.28892-2-Zhiqiang.Hou@nxp.com |
---|---|
State | Superseded |
Delegated to: | Fabio Estevam |
Headers | show |
Series | Add a subcommand 'release' to cmd/cpu.c | expand |
Hi On Tue, Jul 30, 2024 at 9:09 AM Zhiqiang Hou <Zhiqiang.Hou@nxp.com> wrote: > > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > Register ARM A53 core clock for i.MX 8M Mini, Nano and Plus, preparing > for enabling the 'cpu' command, which depends on this to print CPU core > frequency. > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > --- > V4: > - Moved here from other thread. > > drivers/clk/imx/clk-imx8mm.c | 6 ++++++ > drivers/clk/imx/clk-imx8mn.c | 7 +++++++ > drivers/clk/imx/clk-imx8mp.c | 7 +++++++ > 3 files changed, 20 insertions(+) > > diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c > index e538f047b3..8d98fbaaa9 100644 > --- a/drivers/clk/imx/clk-imx8mm.c > +++ b/drivers/clk/imx/clk-imx8mm.c > @@ -21,6 +21,8 @@ static const char * const sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_se > static const char * const sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; > static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; > > +static const char * const imx8mm_arm_core_sels[] = {"arm_a53_src", "arm_pll_out", }; > + > static const char * const imx8mm_a53_sels[] = {"clock-osc-24m", "arm_pll_out", "sys_pll2_500m", > "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", > "audio_pll1_out", "sys_pll3_out", }; > @@ -417,6 +419,10 @@ static int imx8mm_clk_probe(struct udevice *dev) > imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0)); > #endif > > + clk_dm(IMX8MM_CLK_ARM, > + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, > + imx8mm_arm_core_sels, > + ARRAY_SIZE(imx8mm_arm_core_sels))); > return 0; imx_clk_mux2_flags I think you should mark this clock CLK_IS_CRITICAL Michael > } > > diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c > index 8911e342f1..3de03e1f3b 100644 > --- a/drivers/clk/imx/clk-imx8mn.c > +++ b/drivers/clk/imx/clk-imx8mn.c > @@ -23,6 +23,8 @@ static const char * const sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_se > static const char * const sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; > static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; > > +static const char * const imx8mn_arm_core_sels[] = {"arm_a53_src", "arm_pll_out", }; > + > static const char * const imx8mn_a53_sels[] = {"clock-osc-24m", "arm_pll_out", "sys_pll2_500m", > "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", > "audio_pll1_out", "sys_pll3_out", }; > @@ -403,6 +405,11 @@ static int imx8mn_clk_probe(struct udevice *dev) > imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0)); > #endif > > + clk_dm(IMX8MN_CLK_ARM, > + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, > + imx8mn_arm_core_sels, > + ARRAY_SIZE(imx8mn_arm_core_sels))); > + > return 0; > } > > diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c > index 6b18483c81..32ea60f11e 100644 > --- a/drivers/clk/imx/clk-imx8mp.c > +++ b/drivers/clk/imx/clk-imx8mp.c > @@ -21,6 +21,8 @@ static const char * const sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_se > static const char * const sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; > static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; > > +static const char * const imx8mp_arm_core_sels[] = {"arm_a53_src", "arm_pll_out", }; > + > static const char * const imx8mp_a53_sels[] = {"clock-osc-24m", "arm_pll_out", "sys_pll2_500m", > "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", > "audio_pll1_out", "sys_pll3_out", }; > @@ -354,6 +356,11 @@ static int imx8mp_clk_probe(struct udevice *dev) > > clk_dm(IMX8MP_CLK_USDHC3_ROOT, imx_clk_gate4("usdhc3_root_clk", "usdhc3", base + 0x45e0, 0)); > > + clk_dm(IMX8MP_CLK_ARM, > + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, > + imx8mp_arm_core_sels, > + ARRAY_SIZE(imx8mp_arm_core_sels))); > + > return 0; > } > > -- > 2.17.1 >
Hi Michael, > -----Original Message----- > From: Michael Nazzareno Trimarchi <michael@amarulasolutions.com> > Sent: Tuesday, July 30, 2024 3:12 PM > To: Z.Q. Hou <zhiqiang.hou@nxp.com> > Cc: u-boot@lists.denx.de; trini@konsulko.com; Peng Fan > <peng.fan@nxp.com>; festevam@gmail.com; sjg@chromium.org; > marex@denx.de; lukma@denx.de; seanga2@gmail.com; > xypron.glpk@gmx.de > Subject: Re: [PATCHv4 01/14] clk: imx8m: register ARM A53 core clock > > Hi > > On Tue, Jul 30, 2024 at 9:09 AM Zhiqiang Hou <Zhiqiang.Hou@nxp.com> > wrote: > > > > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > > > Register ARM A53 core clock for i.MX 8M Mini, Nano and Plus, preparing > > for enabling the 'cpu' command, which depends on this to print CPU > > core frequency. > > > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > --- > > V4: > > - Moved here from other thread. > > > > drivers/clk/imx/clk-imx8mm.c | 6 ++++++ drivers/clk/imx/clk-imx8mn.c > > | 7 +++++++ drivers/clk/imx/clk-imx8mp.c | 7 +++++++ > > 3 files changed, 20 insertions(+) > > > > diff --git a/drivers/clk/imx/clk-imx8mm.c > > b/drivers/clk/imx/clk-imx8mm.c index e538f047b3..8d98fbaaa9 100644 > > --- a/drivers/clk/imx/clk-imx8mm.c > > +++ b/drivers/clk/imx/clk-imx8mm.c > > @@ -21,6 +21,8 @@ static const char * const sys_pll1_bypass_sels[] = > > {"sys_pll1", "sys_pll1_ref_se static const char * const > > sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; static > > const char * const sys_pll3_bypass_sels[] = {"sys_pll3", > > "sys_pll3_ref_sel", }; > > > > +static const char * const imx8mm_arm_core_sels[] = {"arm_a53_src", > > +"arm_pll_out", }; > > + > > static const char * const imx8mm_a53_sels[] = {"clock-osc-24m", > "arm_pll_out", "sys_pll2_500m", > > > "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", > > > "audio_pll1_out", > > "sys_pll3_out", }; @@ -417,6 +419,10 @@ static int > imx8mm_clk_probe(struct udevice *dev) > > imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, > > 0)); #endif > > > > + clk_dm(IMX8MM_CLK_ARM, > > + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, > > + imx8mm_arm_core_sels, > > + ARRAY_SIZE(imx8mm_arm_core_sels))); > > return 0; > > imx_clk_mux2_flags I think you should mark this clock CLK_IS_CRITICAL Make sense, will update in v5. Thanks, Zhiqiang
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index e538f047b3..8d98fbaaa9 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -21,6 +21,8 @@ static const char * const sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_se static const char * const sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; +static const char * const imx8mm_arm_core_sels[] = {"arm_a53_src", "arm_pll_out", }; + static const char * const imx8mm_a53_sels[] = {"clock-osc-24m", "arm_pll_out", "sys_pll2_500m", "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; @@ -417,6 +419,10 @@ static int imx8mm_clk_probe(struct udevice *dev) imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0)); #endif + clk_dm(IMX8MM_CLK_ARM, + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, + imx8mm_arm_core_sels, + ARRAY_SIZE(imx8mm_arm_core_sels))); return 0; } diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index 8911e342f1..3de03e1f3b 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -23,6 +23,8 @@ static const char * const sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_se static const char * const sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; +static const char * const imx8mn_arm_core_sels[] = {"arm_a53_src", "arm_pll_out", }; + static const char * const imx8mn_a53_sels[] = {"clock-osc-24m", "arm_pll_out", "sys_pll2_500m", "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; @@ -403,6 +405,11 @@ static int imx8mn_clk_probe(struct udevice *dev) imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0)); #endif + clk_dm(IMX8MN_CLK_ARM, + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, + imx8mn_arm_core_sels, + ARRAY_SIZE(imx8mn_arm_core_sels))); + return 0; } diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index 6b18483c81..32ea60f11e 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -21,6 +21,8 @@ static const char * const sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_se static const char * const sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", }; static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; +static const char * const imx8mp_arm_core_sels[] = {"arm_a53_src", "arm_pll_out", }; + static const char * const imx8mp_a53_sels[] = {"clock-osc-24m", "arm_pll_out", "sys_pll2_500m", "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; @@ -354,6 +356,11 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_USDHC3_ROOT, imx_clk_gate4("usdhc3_root_clk", "usdhc3", base + 0x45e0, 0)); + clk_dm(IMX8MP_CLK_ARM, + imx_clk_mux2("arm_core", base + 0x9880, 24, 1, + imx8mp_arm_core_sels, + ARRAY_SIZE(imx8mp_arm_core_sels))); + return 0; }