From a25700e4a04145fcf59e4674a88f55dd088a9c08 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Mon, 2 May 2016 21:39:58 +0100 Subject: [PATCH] imx233: fix frequency reporting The code reported the frequency in kHz instead of Hz, thus breaking a debug screen. Change-Id: Id46de970cfb55bcdc09b63f59b244ee3ad6264b8 --- firmware/target/arm/imx233/system-imx233.c | 2 +- firmware/target/arm/imx233/system-target.h | 10 +++++----- 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) imx233_clkctrl_enable_auto_slow(false); imx233_clkctrl_set_auto_slow_div(BV_CLKCTRL_HBUS_SLOW_DIV__BY8); - cpu_frequency = imx233_clkctrl_get_freq(CLK_CPU); + cpu_frequency = imx233_clkctrl_get_freq(CLK_CPU) * 1000; /* variable in Hz */ #if !defined(BOOTLOADER) && CONFIG_TUNER != 0 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 @@ * Absolute maximum CPU speed: 454.74 MHz (STMP3780), 320.00 MHz (STMP3700) * Intermediate CPU speeds: 261.82 MHz, 64 MHz * Absolute minimum CPU speed: 24 MHz */ -#define IMX233_CPUFREQ_454_MHz 454740 -#define IMX233_CPUFREQ_320_MHz 320000 -#define IMX233_CPUFREQ_261_MHz 261820 -#define IMX233_CPUFREQ_64_MHz 64000 -#define IMX233_CPUFREQ_24_MHz 24000 +#define IMX233_CPUFREQ_454_MHz 454740000 +#define IMX233_CPUFREQ_320_MHz 320000000 +#define IMX233_CPUFREQ_261_MHz 261820000 +#define IMX233_CPUFREQ_64_MHz 64000000 +#define IMX233_CPUFREQ_24_MHz 24000000 #define CPUFREQ_DEFAULT IMX233_CPUFREQ_64_MHz #define CPUFREQ_NORMAL IMX233_CPUFREQ_64_MHz