summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2016-05-02 21:39:58 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2016-05-28 17:18:52 +0200
commita25700e4a04145fcf59e4674a88f55dd088a9c08 (patch)
treea472c8ab9ddb2970c67186b4a978d93b022d0241 /firmware/target/arm
parent643c0a1e0e80ee6010353201792ba6e2be7e1ced (diff)
downloadrockbox-a25700e4a04145fcf59e4674a88f55dd088a9c08.tar.gz
rockbox-a25700e4a04145fcf59e4674a88f55dd088a9c08.zip
imx233: fix frequency reporting
The code reported the frequency in kHz instead of Hz, thus breaking a debug screen. Change-Id: Id46de970cfb55bcdc09b63f59b244ee3ad6264b8
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/imx233/system-imx233.c2
-rw-r--r--firmware/target/arm/imx233/system-target.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index b2ece3be61..1174d1c93c 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -195,7 +195,7 @@ void system_init(void)
195 imx233_clkctrl_enable_auto_slow(false); 195 imx233_clkctrl_enable_auto_slow(false);
196 imx233_clkctrl_set_auto_slow_div(BV_CLKCTRL_HBUS_SLOW_DIV__BY8); 196 imx233_clkctrl_set_auto_slow_div(BV_CLKCTRL_HBUS_SLOW_DIV__BY8);
197 197
198 cpu_frequency = imx233_clkctrl_get_freq(CLK_CPU); 198 cpu_frequency = imx233_clkctrl_get_freq(CLK_CPU) * 1000; /* variable in Hz */
199 199
200#if !defined(BOOTLOADER) && CONFIG_TUNER != 0 200#if !defined(BOOTLOADER) && CONFIG_TUNER != 0
201 fmradio_i2c_init(); 201 fmradio_i2c_init();
diff --git a/firmware/target/arm/imx233/system-target.h b/firmware/target/arm/imx233/system-target.h
index 18c0b249d9..3a8aadd227 100644
--- a/firmware/target/arm/imx233/system-target.h
+++ b/firmware/target/arm/imx233/system-target.h
@@ -32,11 +32,11 @@
32 * Absolute maximum CPU speed: 454.74 MHz (STMP3780), 320.00 MHz (STMP3700) 32 * Absolute maximum CPU speed: 454.74 MHz (STMP3780), 320.00 MHz (STMP3700)
33 * Intermediate CPU speeds: 261.82 MHz, 64 MHz 33 * Intermediate CPU speeds: 261.82 MHz, 64 MHz
34 * Absolute minimum CPU speed: 24 MHz */ 34 * Absolute minimum CPU speed: 24 MHz */
35#define IMX233_CPUFREQ_454_MHz 454740 35#define IMX233_CPUFREQ_454_MHz 454740000
36#define IMX233_CPUFREQ_320_MHz 320000 36#define IMX233_CPUFREQ_320_MHz 320000000
37#define IMX233_CPUFREQ_261_MHz 261820 37#define IMX233_CPUFREQ_261_MHz 261820000
38#define IMX233_CPUFREQ_64_MHz 64000 38#define IMX233_CPUFREQ_64_MHz 64000000
39#define IMX233_CPUFREQ_24_MHz 24000 39#define IMX233_CPUFREQ_24_MHz 24000000
40 40
41#define CPUFREQ_DEFAULT IMX233_CPUFREQ_64_MHz 41#define CPUFREQ_DEFAULT IMX233_CPUFREQ_64_MHz
42#define CPUFREQ_NORMAL IMX233_CPUFREQ_64_MHz 42#define CPUFREQ_NORMAL IMX233_CPUFREQ_64_MHz