devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

jz4760: do the MSC (ie SD) clocking setup when we change PLL0

Browse source 
Change-Id: Ia17b1d7069af507c3f029bcaed0f65e7e97df275
This commit is contained in:
Solomon Peachy 2020-08-29 00:26:22 -04:00
parent fc7eb3b2a3
commit 5e335f5c33
2 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
View file

@ -689,12 +689,18 @@ void DMA_CALLBACK(DMA_SD_TX_CHANNEL1)(void)
#endif /* SD_DMA_INTERRUPT */ #endif /* SD_DMA_INTERRUPT */
#endif /* SD_DMA_ENABLE */ #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) static inline unsigned int jz_sd_calc_clkrt(const int drive, unsigned int rate)
{ {
unsigned int clkrt; unsigned int clkrt = 0;
unsigned int clk_src = sd2_0[drive] ? SD_CLOCK_HIGH : SD_CLOCK_FAST; 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) while (rate < clk_src)
{ {
clkrt++; clkrt++;
@ -703,33 +709,11 @@ static inline unsigned int jz_sd_calc_clkrt(const int drive, unsigned int rate)
return clkrt; 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 */ /* Set the MMC clock frequency */
static void jz_sd_set_clock(const int drive, unsigned int rate) static void jz_sd_set_clock(const int drive, unsigned int rate)
{ {
int clkrt; int clkrt;
/* select clock source from CPM */
cpm_select_msc_clk();
clkrt = jz_sd_calc_clkrt(drive, rate); clkrt = jz_sd_calc_clkrt(drive, rate);
REG_MSC_CLKRT(MSC_CHN(drive)) = clkrt; REG_MSC_CLKRT(MSC_CHN(drive)) = clkrt;

10
firmware/target/mips/ingenic_jz47xx/system-jz4760.c
View file

@ -491,12 +491,14 @@ static void pll0_init(unsigned int freq)
| CPPCR0_PLLEN; /* enable PLL */ | CPPCR0_PLLEN; /* enable PLL */
/* /*
* Init USB Host clock, pllout2 must be n*48MHz * Init USB Host clock, PLL0 must be multiple of 48MHz!
* For JZ4760b UHC - River.
*/ */
usbdiv = (cfcr & CPCCR_PCS) ? freq : (freq / 2); usbdiv = (cfcr & CPCCR_PCS) ? freq : (freq / 2);
REG_CPM_UHCCDR = usbdiv / 48000000 - 1; REG_CPM_UHCCDR = usbdiv / 48000000 - 1;
/* Init MSC clock; shoot for 48MHz base clock. */
REG_CPM_MSCCDR = MSCCDR_MCS | ((freq / 48000000) - 1);
/* init PLL */ /* init PLL */
REG_CPM_CPCCR = cfcr; REG_CPM_CPCCR = cfcr;
REG_CPM_CPPCR0 = plcr1; REG_CPM_CPPCR0 = plcr1;
@ -756,10 +758,7 @@ int system_memory_guard(int newmode)
return 0; return 0;
} }
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
void cpm_select_msc_clk(void);
void set_cpu_frequency(long frequency) void set_cpu_frequency(long frequency)
{ {
if (frequency == cpu_frequency) if (frequency == cpu_frequency)
@ -771,6 +770,5 @@ void set_cpu_frequency(long frequency)
pll0_init(frequency); pll0_init(frequency);
cpu_frequency = __cpm_get_pllout2(); cpu_frequency = __cpm_get_pllout2();
cpm_select_msc_clk();
} }
#endif #endif