From 86545174b98c576d75adacf1f1ae9e65ebfedd9b Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 9 Apr 2010 03:24:17 +0000 Subject: Gigabeat S: A little more housekeeping. Move source clock frequencies to config. header and name them per ref. manual designations. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25549 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config/gigabeats.h | 4 ++++ firmware/target/arm/imx31/ccm-imx31.c | 4 ++-- firmware/target/arm/imx31/ccm-imx31.h | 3 --- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h index 5b1fe0526e..ed8624b505 100644 --- a/firmware/export/config/gigabeats.h +++ b/firmware/export/config/gigabeats.h @@ -8,6 +8,10 @@ #define MODEL_NAME "Toshiba Gigabeat S" +/* System source clock frequencies (Hz) */ +#define CONFIG_CKIL_FREQ 32768 /* RTC Crystal, Tuner */ +#define CONFIG_CKIH_FREQ 27000000 /* PLL Reference */ + /* For Rolo and boot loader */ #define MODEL_NUMBER 21 diff --git a/firmware/target/arm/imx31/ccm-imx31.c b/firmware/target/arm/imx31/ccm-imx31.c index 272f00aca9..0d166e5dbf 100644 --- a/firmware/target/arm/imx31/ccm-imx31.c +++ b/firmware/target/arm/imx31/ccm-imx31.c @@ -49,9 +49,9 @@ void ccm_module_clock_gating(enum IMX31_CG_LIST cg, enum IMX31_CG_MODES mode) unsigned int ccm_get_pll_ref_clk(void) { if ((CCM_CCMR & (3 << 1)) == (1 << 1)) - return CONFIG_CLK32_FREQ * 1024; + return CONFIG_CKIL_FREQ * 1024; else - return CONFIG_HCLK_FREQ; + return CONFIG_CKIH_FREQ; } /* Return PLL frequency in HZ */ diff --git a/firmware/target/arm/imx31/ccm-imx31.h b/firmware/target/arm/imx31/ccm-imx31.h index e1057a9618..e95891255d 100644 --- a/firmware/target/arm/imx31/ccm-imx31.h +++ b/firmware/target/arm/imx31/ccm-imx31.h @@ -93,9 +93,6 @@ enum IMX31_PLLS NUM_PLLS, }; -#define CONFIG_CLK32_FREQ 32768 -#define CONFIG_HCLK_FREQ 27000000 - /* Get the PLL reference clock frequency in HZ */ unsigned int ccm_get_pll_ref_clk(void); -- cgit v1.2.3