On Wed, 22 Dec 2021 11:15:57 +0800 Michael Wu <michael@xxxxxxxxxxxxxxxxx> wrote: Hi Michael, > Default clock soucre is 24M,if we want clock over 24M > We should use pll as clock source Can you say what this patch actually fixes? What is the problem? As far as I know, we don't have any issues with MMC clock frequencies, and are basically always using the PLL as the clock source. This is handled automatically by the common clock framework, which knows about all possible muxes and their parents: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/clk/sunxi-ng/ccu-sun50i-a64.c#n417 In fact that also probably explains the issue you address in patch 2/3. One more comment below. > > Signed-off-by: Michael Wu <michael@xxxxxxxxxxxxxxxxx> > --- > drivers/mmc/host/sunxi-mmc.c | 57 +++++++++++++++++++++++++++++++++++- > 1 file changed, 56 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c > index 7b47ec453fb6..0039ee58b303 100644 > --- a/drivers/mmc/host/sunxi-mmc.c > +++ b/drivers/mmc/host/sunxi-mmc.c > @@ -756,6 +756,57 @@ static int sunxi_mmc_clk_set_phase(struct sunxi_mmc_host *host, > return 0; > } > > +/** > + * > + * sunxi_clk_get_parent() - get parent pll from dts > + * @host: sunxi_mmc_host struct point > + * @@clock: the clock frequency that requested > + * > + * Default clock source is 24M,if we want clock over 24M,We should use > + * pll as clock soure > + * > + * Return:the 0:ok,other:failed > + */ > +static int sunxi_clk_get_parent(struct sunxi_mmc_host *host, u32 clock) > +{ > + struct clk *sclk = NULL; > + char *sclk_name = NULL; > + u32 src_clk = 0; > + s32 err = 0; > + struct device *dev = mmc_dev(host->mmc); > + > + sclk = clk_get(dev, "osc24m"); > + sclk_name = "osc24m"; This "getting clocks by their global name" is not the way it should work, you just reference clocks you get from your very own DT node (devm_clk_get()). This is probably something that the BSP kernel does very differently? Cheers, Andre > + > + if (IS_ERR(sclk)) { > + dev_err(mmc_dev(host->mmc), "Error to get source clock %s\n", > + sclk_name); > + return PTR_ERR(sclk); > + } > + > + src_clk = clk_get_rate(sclk); > + if (clock > src_clk) { > + clk_put(sclk); > + sclk = clk_get(dev, "pll_periph"); > + sclk_name = "pll_periph"; > + } > + if (IS_ERR(sclk)) { > + dev_err(mmc_dev(host->mmc), "Error to get source clock %s\n", > + sclk_name); > + return PTR_ERR(sclk); > + } > + > + err = clk_set_parent(host->clk_mmc, sclk); > + if (err) { > + dev_err(mmc_dev(host->mmc), "set parent failed\n"); > + clk_put(sclk); > + return err; > + } > + clk_put(sclk); > + return 0; > +} > + > + > static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host, > struct mmc_ios *ios) > { > @@ -801,7 +852,11 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host, > return ret; > } > } > - > + /** > + * No check return value,because dts may not have osc24M, and pll_periph, > + * at that time,use default value from clk system > + */ > + sunxi_clk_get_parent(host, clock); > rate = clk_round_rate(host->clk_mmc, clock); > if (rate < 0) { > dev_err(mmc_dev(mmc), "error rounding clk to %d: %ld\n",
