From 5e335f5c33cb9e72c6615c503a876e57b8176dab Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sat, 29 Aug 2020 00:26:22 -0400 Subject: jz4760: do the MSC (ie SD) clocking setup when we change PLL0 Change-Id: Ia17b1d7069af507c3f029bcaed0f65e7e97df275 --- .../target/mips/ingenic_jz47xx/ata-sd-jz4760.c | 34 ++++++---------------- 1 file changed, 9 insertions(+), 25 deletions(-) (limited to 'firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c') diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c index 881c83066e..8da1313cf8 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c @@ -689,12 +689,18 @@ void DMA_CALLBACK(DMA_SD_TX_CHANNEL1)(void) #endif /* SD_DMA_INTERRUPT */ #endif /* SD_DMA_ENABLE */ +#ifndef HAVE_ADJUSTABLE_CPU_FREQ +#define cpu_frequency __cpm_get_pllout2() +#endif + static inline unsigned int jz_sd_calc_clkrt(const int drive, unsigned int rate) { - unsigned int clkrt; - unsigned int clk_src = sd2_0[drive] ? SD_CLOCK_HIGH : SD_CLOCK_FAST; + unsigned int clkrt = 0; + unsigned int clk_src = cpu_frequency / __cpm_get_mscdiv(); /* MSC_CLK */ + + if (!sd2_0[drive] && rate > SD_CLOCK_FAST) + rate = SD_CLOCK_FAST; - clkrt = 0; while (rate < clk_src) { clkrt++; @@ -703,33 +709,11 @@ static inline unsigned int jz_sd_calc_clkrt(const int drive, unsigned int rate) return clkrt; } -#ifndef HAVE_ADJUSTABLE_CPU_FREQ -#define cpu_frequency __cpm_get_pllout2() -#endif - -void cpm_select_msc_clk(void) -{ - unsigned int div = cpu_frequency / SD_CLOCK_FAST; - - if (div == 0) - div = 1; - - if (div == __cpm_get_mscdiv()) - return; - - REG_CPM_MSCCDR = MSCCDR_MCS | (div - 1); - DEBUG("MSCCLK == %x\n", REG_CPM_MSCCDR); - __cpm_enable_pll_change(); -} - /* Set the MMC clock frequency */ static void jz_sd_set_clock(const int drive, unsigned int rate) { int clkrt; - /* select clock source from CPM */ - cpm_select_msc_clk(); - clkrt = jz_sd_calc_clkrt(drive, rate); REG_MSC_CLKRT(MSC_CHN(drive)) = clkrt; -- cgit v1.2.3