* [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx @ 2020-08-20 19:45 Lucas Stach 2020-08-20 19:45 ` [PATCH 2/2] clk: imx8mm: fix CPU clock Lucas Stach 2020-09-30 12:40 ` [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach 0 siblings, 2 replies; 5+ messages in thread From: Lucas Stach @ 2020-08-20 19:45 UTC (permalink / raw) To: barebox Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/clk/imx/clk-pll14xx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c index 91e9624a606d..6ba519516b9f 100644 --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -358,8 +358,7 @@ static void clk_pll14xx_unprepare(struct clk *clk) { struct clk_pll14xx *pll = to_clk_pll14xx(clk); u32 val; -printf("%s %p\n", __func__, pll); -printf("%s %p\n", __func__, pll->base); + /* * Set RST to 0, power down mode is enabled and * every digital block is reset -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] clk: imx8mm: fix CPU clock 2020-08-20 19:45 [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach @ 2020-08-20 19:45 ` Lucas Stach 2020-08-21 4:41 ` Sascha Hauer 2020-09-30 12:40 ` [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach 1 sibling, 1 reply; 5+ messages in thread From: Lucas Stach @ 2020-08-20 19:45 UTC (permalink / raw) To: barebox This is a port of the Linux kernel commit d3b70cd87e77 (clk: imx: imx8mm: fix a53 cpu cloc). This allows the reparenting as specified in the new DTs to succeed. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/clk/imx/clk-imx8mm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index a31741af884f..17cb0177f758 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -26,6 +26,8 @@ static const char *sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; static const char *imx8mm_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pll2_500m", "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; +static const char *imx8mm_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; + static const char *imx8mm_m4_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "sys_pll1_266m", "sys_pll1_800m", "audio_pll1_out", "video_pll1_out", "sys_pll3_out", }; @@ -396,6 +398,9 @@ static int imx8mm_clocks_init(struct device_node *ccm_np) clks[IMX8MM_CLK_GPU3D_DIV] = imx_clk_divider2("gpu3d_div", "gpu3d_cg", ccm + 0x8180, 0, 3); clks[IMX8MM_CLK_GPU2D_DIV] = imx_clk_divider2("gpu2d_div", "gpu2d_cg", ccm + 0x8200, 0, 3); + /* CORE SEL */ + clks[IMX8MM_CLK_A53_CORE] = imx_clk_mux2_flags("arm_a53_core", ccm + 0x9880, 24, 1, imx8mm_a53_core_sels, ARRAY_SIZE(imx8mm_a53_core_sels), CLK_IS_CRITICAL); + /* BUS */ clks[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_composite_critical("main_axi", imx8mm_main_axi_sels, ccm + 0x8800); clks[IMX8MM_CLK_ENET_AXI] = imx8m_clk_composite("enet_axi", imx8mm_enet_axi_sels, ccm + 0x8880); @@ -556,11 +561,11 @@ static int imx8mm_clocks_init(struct device_node *ccm_np) clks[IMX8MM_CLK_DRAM_ALT_ROOT] = imx_clk_fixed_factor("dram_alt_root", "dram_alt", 1, 4); clks[IMX8MM_CLK_DRAM_CORE] = imx_clk_mux2_flags("dram_core_clk", ccm + 0x9800, 24, 1, imx8mm_dram_core_sels, ARRAY_SIZE(imx8mm_dram_core_sels), CLK_IS_CRITICAL); - clks[IMX8MM_CLK_ARM] = imx_clk_cpu("arm", "arm_a53_div", - clks[IMX8MM_CLK_A53_DIV], - clks[IMX8MM_CLK_A53_SRC], + clks[IMX8MM_CLK_ARM] = imx_clk_cpu("arm", "arm_a53_core", + clks[IMX8MM_CLK_A53_CORE], + clks[IMX8MM_CLK_A53_CORE], clks[IMX8MM_ARM_PLL_OUT], - clks[IMX8MM_SYS_PLL1_800M]); + clks[IMX8MM_CLK_A53_DIV]); imx_check_clocks(clks, ARRAY_SIZE(clks)); -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] clk: imx8mm: fix CPU clock 2020-08-20 19:45 ` [PATCH 2/2] clk: imx8mm: fix CPU clock Lucas Stach @ 2020-08-21 4:41 ` Sascha Hauer 0 siblings, 0 replies; 5+ messages in thread From: Sascha Hauer @ 2020-08-21 4:41 UTC (permalink / raw) To: Lucas Stach; +Cc: barebox On Thu, Aug 20, 2020 at 09:45:47PM +0200, Lucas Stach wrote: > This is a port of the Linux kernel commit d3b70cd87e77 (clk: imx: imx8mm: > fix a53 cpu cloc). This allows the reparenting as specified in the new DTs > to succeed. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/clk/imx/clk-imx8mm.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) Applied, thanks. As part of the clk driver update I did the same for i.MX8MP, now I guess we'll need the same for i.MX8MQ. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx 2020-08-20 19:45 [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach 2020-08-20 19:45 ` [PATCH 2/2] clk: imx8mm: fix CPU clock Lucas Stach @ 2020-09-30 12:40 ` Lucas Stach 2020-10-02 4:13 ` Sascha Hauer 1 sibling, 1 reply; 5+ messages in thread From: Lucas Stach @ 2020-09-30 12:40 UTC (permalink / raw) To: barebox Hi Sascha, seems like this patch fell though the cracks (but 2/2 has been applied). Regards, Lucas On Do, 2020-08-20 at 21:45 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/clk/imx/clk-pll14xx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c > index 91e9624a606d..6ba519516b9f 100644 > --- a/drivers/clk/imx/clk-pll14xx.c > +++ b/drivers/clk/imx/clk-pll14xx.c > @@ -358,8 +358,7 @@ static void clk_pll14xx_unprepare(struct clk *clk) > { > struct clk_pll14xx *pll = to_clk_pll14xx(clk); > u32 val; > -printf("%s %p\n", __func__, pll); > -printf("%s %p\n", __func__, pll->base); > + > /* > * Set RST to 0, power down mode is enabled and > * every digital block is reset _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx 2020-09-30 12:40 ` [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach @ 2020-10-02 4:13 ` Sascha Hauer 0 siblings, 0 replies; 5+ messages in thread From: Sascha Hauer @ 2020-10-02 4:13 UTC (permalink / raw) To: Lucas Stach; +Cc: barebox On Wed, Sep 30, 2020 at 02:40:34PM +0200, Lucas Stach wrote: > Hi Sascha, > > seems like this patch fell though the cracks (but 2/2 has been applied). I had created this patch myself just before you sent it, so I didn't apply this one but my own version. This really didn't make it into 2020.09.0 as it should, but it's on current master. Sascha > > Regards, > Lucas > > On Do, 2020-08-20 at 21:45 +0200, Lucas Stach wrote: > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > --- > > drivers/clk/imx/clk-pll14xx.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c > > index 91e9624a606d..6ba519516b9f 100644 > > --- a/drivers/clk/imx/clk-pll14xx.c > > +++ b/drivers/clk/imx/clk-pll14xx.c > > @@ -358,8 +358,7 @@ static void clk_pll14xx_unprepare(struct clk *clk) > > { > > struct clk_pll14xx *pll = to_clk_pll14xx(clk); > > u32 val; > > -printf("%s %p\n", __func__, pll); > > -printf("%s %p\n", __func__, pll->base); > > + > > /* > > * Set RST to 0, power down mode is enabled and > > * every digital block is reset > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-02 4:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-20 19:45 [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach 2020-08-20 19:45 ` [PATCH 2/2] clk: imx8mm: fix CPU clock Lucas Stach 2020-08-21 4:41 ` Sascha Hauer 2020-09-30 12:40 ` [PATCH 1/2] clk: imx: remove leftover debug printk's from pll14xx Lucas Stach 2020-10-02 4:13 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox