Objdump confirms no difference in the resulting binary. Signed-off-by: Ian Campbell <i...@hellion.org.uk> --- arch/arm/include/asm/arch-sunxi/clock.h | 7 +++++++ drivers/mmc/sunxi_mmc.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/clock.h b/arch/arm/include/asm/arch-sunxi/clock.h index b6184dc..ef03d5b 100644 --- a/arch/arm/include/asm/arch-sunxi/clock.h +++ b/arch/arm/include/asm/arch-sunxi/clock.h @@ -161,6 +161,7 @@ struct sunxi_ccm_reg { #define AHB_GATE_OFFSET_MMC2 10 #define AHB_GATE_OFFSET_MMC1 9 #define AHB_GATE_OFFSET_MMC0 8 +#define AHB_GATE_OFFSET_MMC(n) (AHB_GATE_OFFSET_MMC0 + (n)) #define AHB_GATE_OFFSET_BIST 7 #define AHB_GATE_OFFSET_DMA 6 #define AHB_GATE_OFFSET_SS 5 @@ -222,6 +223,12 @@ struct sunxi_ccm_reg { #define CCM_MBUS_CTRL_CLK_SRC_PLL5 0x2 #define CCM_MBUS_CTRL_GATE (0x1 << 31) +#define CCM_MMC_CTRL_OSCM24 (0x0 << 24) +#define CCM_MMC_CTRL_PLL6 (0x1 << 24) +#define CCM_MMC_CTRL_PLL5 (0x2 << 24) + +#define CCM_MMC_CTRL_ENABLE (0x1 << 31) + #define CCM_GMAC_CTRL_TX_CLK_SRC_MII 0x0 #define CCM_GMAC_CTRL_TX_CLK_SRC_EXT_RGMII 0x1 #define CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII 0x2 diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index c336c70..73b891d 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -200,7 +200,7 @@ static int mmc_clk_io_on(int sdc_no) /* config ahb clock */ rval = readl(&ccm->ahb_gate0); - rval |= (1 << (8 + sdc_no)); + rval |= 1 << AHB_GATE_OFFSET_MMC(sdc_no); writel(rval, &ccm->ahb_gate0); /* config mod clock */ @@ -209,7 +209,8 @@ static int mmc_clk_io_on(int sdc_no) divider = 4; else divider = 3; - writel((0x1 << 31) | (0x2 << 24) | divider, mmchost->mclkreg); + writel(CCM_MMC_CTRL_ENABLE | CCM_MMC_CTRL_PLL5 | divider, + mmchost->mclkreg); mmchost->mod_clk = pll5_clk / (divider + 1); dumphex32("ccmu", (char *)SUNXI_CCM_BASE, 0x100); -- 1.8.5.3 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.