len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

imx233: rework frequency scaling

Browse source 
Move to a table based approach (scales better) and distinguish
between upward changes (increase frequency) and downward changes
(decrease frequency). This provides a better ordering of
operations and in particular it allows to avoid changing the
regulator while running at low speed since it takes a long time !
This should result in a much smoother scaling.

Change-Id: Iad7e5b61277e215f31c07877fbbad07ddde1171f
This commit is contained in:
Amaury Pouly 2013-01-13 00:55:34 +00:00
parent 29e51a1777
commit 4307f95a1f
1 changed files with 71 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

138
firmware/target/arm/imx233/system-imx233.c
View file

@ -128,6 +128,8 @@ void system_init(void)
imx233_clkctrl_set_auto_slow_divisor(AS_DIV_8); imx233_clkctrl_set_auto_slow_divisor(AS_DIV_8);
imx233_clkctrl_enable_auto_slow(true); imx233_clkctrl_enable_auto_slow(true);
cpu_frequency = imx233_clkctrl_get_clock_freq(CLK_CPU);
#if !defined(BOOTLOADER) &&(defined(SANSA_FUZEPLUS) || \ #if !defined(BOOTLOADER) &&(defined(SANSA_FUZEPLUS) || \
defined(CREATIVE_ZENXFI3) || defined(CREATIVE_ZENXFI2)) defined(CREATIVE_ZENXFI3) || defined(CREATIVE_ZENXFI2))
fmradio_i2c_init(); fmradio_i2c_init();
@ -174,88 +176,88 @@ void imx233_digctl_set_arm_cache_timings(unsigned timings)
} }
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
struct cpufreq_profile_t
{
/* key */
long cpu_freq;
/* parameters */
int vddd, vddd_bo;
int hbus_div;
int cpu_idiv, cpu_fdiv;
long emi_freq;
int arm_cache_timings;
};
static struct cpufreq_profile_t cpu_profiles[] =
{
/* clk_p@454.74 MHz, clk_h@130.91 MHz, clk_emi@130.91 MHz */
{IMX233_CPUFREQ_454_MHz, 1550, 1450, 3, 1, 19, IMX233_EMIFREQ_130_MHz, 0},
/* clk_p@261.82 MHz, clk_h@130.91 MHz, clk_emi@130.91 MHz */
{IMX233_CPUFREQ_261_MHz, 1275, 1175, 2, 1, 33, IMX233_EMIFREQ_130_MHz, 0},
/* clk_p@64 MHz, clk_h@64 MHz, clk_emi@64 MHz */
{IMX233_CPUFREQ_64_MHz, 1050, 975, 1, 5, 27, IMX233_EMIFREQ_64_MHz, 0},
/* dummy */
{0, 0, 0, 0, 0, 0, 0, 0}
};
#define NR_CPU_PROFILES ((int)(sizeof(cpu_profiles)/sizeof(cpu_profiles[0])))
void set_cpu_frequency(long frequency) void set_cpu_frequency(long frequency)
{ {
/* don't change the frequency if it is useless (changes are expensive) */ /* don't change the frequency if it is useless (changes are expensive) */
if(cpu_frequency == frequency) if(cpu_frequency == frequency)
return; return;
cpu_frequency = frequency; struct cpufreq_profile_t *prof = cpu_profiles;
while(prof->cpu_freq != 0 && prof->cpu_freq != frequency)
prof++;
if(prof->cpu_freq == 0)
return;
/* disable auto-slow (enable back afterwards) */ /* disable auto-slow (enable back afterwards) */
bool as = imx233_clkctrl_is_auto_slow_enabled(); bool as = imx233_clkctrl_is_auto_slow_enabled();
imx233_clkctrl_enable_auto_slow(false); imx233_clkctrl_enable_auto_slow(false);
/* go back to a known state in safe way:
* clk_p@24 MHz
* clk_h@6 MHz
* WARNING: we must absolutely avoid that clk_h be too low or too high
* during the change. We first change the clk_p/clk_h ratio to 4 so
* that it cannot be too high (480/4=120 MHz max) or too low
* (24/4=6 MHz min). Then we switch clk_p to bypass. We chose a ratio of 4
* which is greater than all clk_p/clk_h ratios used below so that further
* changes are safe too */
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 4);
imx233_clkctrl_set_bypass_pll(CLK_CPU, true);
imx233_digctl_set_arm_cache_timings(0);
switch(frequency) /* WARNING watch out the order ! */
if(frequency > cpu_frequency)
{ {
case IMX233_CPUFREQ_454_MHz: /* Change VDDD regulator */
/* set VDDD to 1.550 mV (brownout at 1.450 mV) */ imx233_power_set_regulator(REGULATOR_VDDD, prof->vddd, prof->vddd_bo);
imx233_power_set_regulator(REGULATOR_VDDD, 1550, 1450); /* Change ARM cache timings */
/* clk_h@clk_p/3 */ imx233_digctl_set_arm_cache_timings(prof->arm_cache_timings);
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 3); /* Switch CPU to crystal at 24MHz */
/* clk_p@ref_cpu/1*18/19 */ imx233_clkctrl_set_bypass_pll(CLK_CPU, true);
imx233_clkctrl_set_fractional_divisor(CLK_CPU, 19); /* Program CPU divider for PLL */
imx233_clkctrl_set_clock_divisor(CLK_CPU, 1); imx233_clkctrl_set_fractional_divisor(CLK_CPU, prof->cpu_fdiv);
imx233_clkctrl_set_bypass_pll(CLK_CPU, false); imx233_clkctrl_set_clock_divisor(CLK_CPU, prof->cpu_idiv);
/* Change the HBUS divider to its final value */
imx233_emi_set_frequency(IMX233_EMIFREQ_130_MHz); imx233_clkctrl_set_clock_divisor(CLK_HBUS, prof->hbus_div);
/* ref_cpu@480 MHz /* Switch back CPU to PLL */
* ref_emi@480 MHz imx233_clkctrl_set_bypass_pll(CLK_CPU, false);
* clk_emi@130.91 MHz /* Set the new EMI frequency */
* clk_p@454.74 MHz imx233_emi_set_frequency(prof->emi_freq);
* clk_h@130.91 MHz */ }
break; else
case IMX233_CPUFREQ_261_MHz: {
/* set VDDD to 1.275 mV (brownout at 1.175 mV) */ /* Switch CPU to crystal at 24MHz */
imx233_power_set_regulator(REGULATOR_VDDD, 1275, 1175); imx233_clkctrl_set_bypass_pll(CLK_CPU, true);
/* clk_h@clk_p/2 */ /* Program HBUS divider to its final value */
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 2); imx233_clkctrl_set_clock_divisor(CLK_HBUS, prof->hbus_div);
/* clk_p@ref_cpu/1*18/33 */ /* Program CPU divider for PLL */
imx233_clkctrl_set_fractional_divisor(CLK_CPU, 33); imx233_clkctrl_set_fractional_divisor(CLK_CPU, prof->cpu_fdiv);
imx233_clkctrl_set_clock_divisor(CLK_CPU, 1); imx233_clkctrl_set_clock_divisor(CLK_CPU, prof->cpu_idiv);
imx233_clkctrl_set_bypass_pll(CLK_CPU, false); /* Switch back CPU to PLL */
imx233_clkctrl_set_bypass_pll(CLK_CPU, false);
imx233_emi_set_frequency(IMX233_EMIFREQ_130_MHz); /* Set the new EMI frequency */
/* ref_cpu@480 MHz imx233_emi_set_frequency(prof->emi_freq);
* ref_emi@480 MHz /* Change ARM cache timings */
* clk_emi@130.91 MHz imx233_digctl_set_arm_cache_timings(prof->arm_cache_timings);
* clk_p@261.82 MHz /* Change VDDD regulator */
* clk_h@130.91 MHz */ imx233_power_set_regulator(REGULATOR_VDDD, prof->vddd, prof->vddd_bo);
break;
case IMX233_CPUFREQ_64_MHz:
/* set VDDD to 1.050 mV (brownout at 0.975 mV) */
imx233_power_set_regulator(REGULATOR_VDDD, 1050, 975);
/* clk_h@clk_p */
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 1);
/* clk_p@ref_cpu/5*18/27 */
imx233_clkctrl_set_fractional_divisor(CLK_CPU, 27);
imx233_clkctrl_set_clock_divisor(CLK_CPU, 5);
imx233_clkctrl_set_bypass_pll(CLK_CPU, false);
imx233_emi_set_frequency(IMX233_EMIFREQ_64_MHz);
imx233_digctl_set_arm_cache_timings(3);
/* ref_cpu@480 MHz
* ref_emi@480 MHz
* clk_emi@64 MHz
* clk_p@64 MHz
* clk_h@64 MHz */
default:
break;
} }
/* enable auto slow again */ /* enable auto slow again */
imx233_clkctrl_enable_auto_slow(as); imx233_clkctrl_enable_auto_slow(as);
/* update frequency */
cpu_frequency = frequency;
} }
#endif #endif