imx233: implement basic frequency scaling and enable auto-slow

This does not scale the EMI frequency and keep the processor
betweel 261MHz and 454MHz. It can still be improve. The auto-slow
divisor could still be change, 8 seems reasonable for now

Change-Id: I639bb3f6b7f8efedc7dc58d08127849156eeb1b6
This commit is contained in:
Amaury Pouly 2012-08-30 20:56:39 +02:00
parent 6c2190ea04
commit c9ad8688f1
2 changed files with 48 additions and 12 deletions

View file

@ -35,6 +35,8 @@
#include "icoll-imx233.h" #include "icoll-imx233.h"
#include "lradc-imx233.h" #include "lradc-imx233.h"
#include "rtc-imx233.h" #include "rtc-imx233.h"
#include "power-imx233.h"
#include "emi-imx233.h"
#include "lcd.h" #include "lcd.h"
#include "backlight-target.h" #include "backlight-target.h"
#include "button.h" #include "button.h"
@ -115,6 +117,14 @@ void system_init(void)
defined(CREATIVE_ZENXFI3) || defined(CREATIVE_ZENXFI2)) defined(CREATIVE_ZENXFI3) || defined(CREATIVE_ZENXFI2))
fmradio_i2c_init(); fmradio_i2c_init();
#endif #endif
imx233_clkctrl_enable_auto_slow_monitor(AS_CPU_INSTR, true);
imx233_clkctrl_enable_auto_slow_monitor(AS_CPU_DATA, true);
imx233_clkctrl_enable_auto_slow_monitor(AS_TRAFFIC, true);
imx233_clkctrl_enable_auto_slow_monitor(AS_TRAFFIC_JAM, true);
imx233_clkctrl_enable_auto_slow_monitor(AS_APBXDMA, true);
imx233_clkctrl_enable_auto_slow_monitor(AS_APBHDMA, true);
imx233_clkctrl_set_auto_slow_divisor(AS_DIV_8);
imx233_clkctrl_enable_auto_slow(true);
} }
bool imx233_us_elapsed(uint32_t ref, unsigned us_delay) bool imx233_us_elapsed(uint32_t ref, unsigned us_delay)
@ -151,18 +161,44 @@ void set_cpu_frequency(long frequency)
{ {
switch(frequency) switch(frequency)
{ {
#if 0
case IMX233_CPUFREQ_454_MHz: case IMX233_CPUFREQ_454_MHz:
/* clk_h@clk_p/3 */ /* go back to a known state: everything at 24MHz ! */
imx233_set_clock_divisor(CLK_AHB, 3); imx233_clkctrl_set_bypass_pll(CLK_CPU, true);
/* clk_p@ref_cpu/1*18/19 */ imx233_clkctrl_set_clock_divisor(CLK_HBUS, 1);
imx233_set_fractional_divisor(CLK_CPU, 19); _logf("set freq 454MHz");
imx233_set_clock_divisor(CLK_CPU, 1); /* set VDDD to 1.550 mV (brownout at 1.450 mV) */
imx233_power_set_regulator(REGULATOR_VDDD, 1550, 1450);
/* clk_h@clk_p/2 */
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 3);
/* clk_p@ref_cpu/1*18/33 */
imx233_clkctrl_set_fractional_divisor(CLK_CPU, 19);
imx233_clkctrl_set_clock_divisor(CLK_CPU, 1);
imx233_clkctrl_set_bypass_pll(CLK_CPU, false);
/* ref_cpu@480 MHz /* ref_cpu@480 MHz
* clk_p@454.74 MHz * ref_emi@480 MHz
* clk_h@151.58 MHz */ * clk_emi@130.91 MHz
* clk_p@261.82 MHz
* clk_h@130.91 MHz */
break;
case IMX233_CPUFREQ_261_MHz:
/* go back to a known state: everything at 24MHz ! */
imx233_clkctrl_set_bypass_pll(CLK_CPU, true);
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 1);
_logf("set freq 261MHz");
/* set VDDD to 1.550 mV (brownout at 1.275 mV) */
imx233_power_set_regulator(REGULATOR_VDDD, 1275, 1175);
/* clk_h@clk_p/2 */
imx233_clkctrl_set_clock_divisor(CLK_HBUS, 2);
/* clk_p@ref_cpu/1*18/33 */
imx233_clkctrl_set_fractional_divisor(CLK_CPU, 33);
imx233_clkctrl_set_clock_divisor(CLK_CPU, 1);
imx233_clkctrl_set_bypass_pll(CLK_CPU, false);
/* ref_cpu@480 MHz
* ref_emi@480 MHz
* clk_emi@130.91 MHz
* clk_p@261.82 MHz
* clk_h@130.91 MHz */
break; break;
#endif
default: default:
break; break;
} }

View file

@ -55,10 +55,10 @@
#define IMX233_CPUFREQ_64_MHz 64000000 #define IMX233_CPUFREQ_64_MHz 64000000
#define IMX233_CPUFREQ_24_MHz 24000000 #define IMX233_CPUFREQ_24_MHz 24000000
#define CPUFREQ_DEFAULT IMX233_CPUFREQ_454_MHz #define CPUFREQ_DEFAULT IMX233_CPUFREQ_261_MHz
#define CPUFREQ_NORMAL IMX233_CPUFREQ_454_MHz #define CPUFREQ_NORMAL IMX233_CPUFREQ_261_MHz
#define CPUFREQ_MAX IMX233_CPUFREQ_454_MHz #define CPUFREQ_MAX IMX233_CPUFREQ_454_MHz
#define CPUFREQ_SLEEP IMX233_CPUFREQ_454_MHz #define CPUFREQ_SLEEP IMX233_CPUFREQ_261_MHz
void udelay(unsigned us); void udelay(unsigned us);
bool imx233_us_elapsed(uint32_t ref, unsigned us_delay); bool imx233_us_elapsed(uint32_t ref, unsigned us_delay);