On Sun, 30 Nov 2025 21:45:19 +0000 Yixun Lan <[email protected]> wrote:
> Minor clock adjustment for new A733 MMC controller, the SMHC0_CLK_REG > start at offset 0x400, and with step size of 0x10. > > Signed-off-by: Yixun Lan <[email protected]> > --- > drivers/mmc/sunxi_mmc.c | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c > index e28c81afffe..689bec6693c 100644 > --- a/drivers/mmc/sunxi_mmc.c > +++ b/drivers/mmc/sunxi_mmc.c > @@ -112,6 +112,9 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, > unsigned int hz) > if (priv->mmc_no == 2) > pll_hz *= 2; > } > + > + if (IS_ENABLED(CONFIG_MACH_SUN60I_A733)) > + pll_hz /= 3; > } > > div = pll_hz / hz; > @@ -167,7 +170,8 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, > unsigned int hz) > } > > /* The A523 has a second divider, not a shift. */ > - if (IS_ENABLED(CONFIG_MACH_SUN55I_A523)) > + if (IS_ENABLED(CONFIG_MACH_SUN55I_A523) || > + IS_ENABLED(CONFIG_MACH_SUN60I_A733)) > n = (1U << n) - 1; > > writel(CCM_MMC_CTRL_ENABLE| pll | CCM_MMC_CTRL_N(n) | > @@ -661,17 +665,28 @@ static const struct dm_mmc_ops sunxi_mmc_ops = { > .get_cd = sunxi_mmc_getcd, > }; > > -static unsigned get_mclk_offset(void) > +static unsigned int get_mclk_offset(void) > { > if (IS_ENABLED(CONFIG_MACH_SUN9I_A80)) > return 0x410; > > + if (IS_ENABLED(CONFIG_MACH_SUN60I_A733)) > + return 0xd00; > + > if (IS_ENABLED(CONFIG_SUN50I_GEN_H6) || > IS_ENABLED(CONFIG_SUNXI_GEN_NCAT2)) > return 0x830; > > return 0x88; > }; > > +static unsigned int get_mclk_size(void) Can you please fold this function into the one above, passing in the MMC controller number? static unsigned int get_mclk_offset(int mmc_no); Thanks, Andre > +{ > + if (IS_ENABLED(CONFIG_MACH_SUN60I_A733)) > + return 0x10; > + > + return 0x4; > +}; > + > static int sunxi_mmc_probe(struct udevice *dev) > { > struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); > @@ -707,7 +722,7 @@ static int sunxi_mmc_probe(struct udevice *dev) > ccu_reg = (u32 *)(uintptr_t)ofnode_get_addr(args.node); > > priv->mmc_no = ((uintptr_t)priv->reg - SUNXI_MMC0_BASE) / 0x1000; > - priv->mclkreg = (void *)ccu_reg + get_mclk_offset() + priv->mmc_no * 4; > + priv->mclkreg = (void *)ccu_reg + get_mclk_offset() + priv->mmc_no * > get_mclk_size(); > > ret = clk_get_by_name(dev, "ahb", &gate_clk); > if (!ret) >
