From df14bf29e03c0f74eed3ab55fcad600dd0b89a7c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 22 Apr 2009 23:02:53 +0200 Subject: i.MX1: Fix gpt clock speed got broken in commit: commit 309a75baafc307c77aab2ebe6055ee89a963c626 Author: Sascha Hauer Date: Fri Feb 20 18:14:52 2009 +0100 i.MX use fecclk for fec and gtpclk for gpt Signed-off-by: Sascha Hauer Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/speed-imx1.c | 50 +----------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-imx/speed-imx1.c b/arch/arm/mach-imx/speed-imx1.c index 5d3352a8a7..5b2d540dd1 100644 --- a/arch/arm/mach-imx/speed-imx1.c +++ b/arch/arm/mach-imx/speed-imx1.c @@ -76,54 +76,6 @@ ulong imx_get_uartclk(void) ulong imx_get_gptclk(void) { - return imx_get_perclk1() / (((PCDR) & 0xf)+1); -} - -#if 0 -typedef enum imx_cookies { - PARAM_CPUCLK, - PARAM_SYSCLOCK, - PARAM_PERCLK1, - PARAM_PERCLK2, - PARAM_PERCLK3, - PARAM_BCLK, - PARAM_HCLK, - PARAM_FCLK, - PARAM_ARCH_NUMBER, - PARAM_LAST, -} imx_cookies_t; - -static struct param_d imx_params[] = { - [PARAM_CPUCLK] = { .name = "imx_cpuclk", .flags = PARAM_FLAG_RO}, - [PARAM_SYSCLOCK] = { .name = "imx_system_clk", .flags = PARAM_FLAG_RO}, - [PARAM_PERCLK1] = { .name = "imx_perclk1", .flags = PARAM_FLAG_RO}, - [PARAM_PERCLK2] = { .name = "imx_perclk2", .flags = PARAM_FLAG_RO}, - [PARAM_PERCLK3] = { .name = "imx_perclk3", .flags = PARAM_FLAG_RO}, - [PARAM_BCLK] = { .name = "imx_bclk", .flags = PARAM_FLAG_RO}, - [PARAM_HCLK] = { .name = "imx_hclk", .flags = PARAM_FLAG_RO}, - [PARAM_FCLK] = { .name = "imx_fclk", .flags = PARAM_FLAG_RO}, - [PARAM_ARCH_NUMBER] = { .name = "arch_number",}, -}; - -static int imx_clk_init(void) -{ - int i; - - imx_params[PARAM_CPUCLK].value.val_ulong = get_mcuPLLCLK(); - imx_params[PARAM_SYSCLOCK].value.val_ulong = get_systemPLLCLK(); - imx_params[PARAM_PERCLK1].value.val_ulong = get_PERCLK1(); - imx_params[PARAM_PERCLK2].value.val_ulong = get_PERCLK2(); - imx_params[PARAM_PERCLK3].value.val_ulong = get_PERCLK3(); - imx_params[PARAM_BCLK].value.val_ulong = get_BCLK(); - imx_params[PARAM_HCLK].value.val_ulong = get_HCLK(); - imx_params[PARAM_FCLK].value.val_ulong = get_FCLK(); - imx_params[PARAM_ARCH_NUMBER].value.val_ulong = arch_number; - - for (i = 0; i < PARAM_LAST; i++) - global_add_parameter(&imx_params[i]); - - return 0; + return imx_get_perclk1(); } -device_initcall(imx_clk_init); -#endif -- cgit v1.2.3