diff options
| author | Ye.Li <B37916@freescale.com> | 2015-02-01 22:25:46 +0800 |
|---|---|---|
| committer | Frank Li <Frank.Li@freescale.com> | 2015-02-04 21:53:30 +0800 |
| commit | 6e250796d6a07d84093eeae96e5a6e4c593cdb0b (patch) | |
| tree | 361e9ddf77a2c6dd6570aec962d397622d4b933d | |
| parent | 8aa92b831955c968f802286de561825227e761ce (diff) | |
| download | u-boot-imx-6e250796d6a07d84093eeae96e5a6e4c593cdb0b.zip u-boot-imx-6e250796d6a07d84093eeae96e5a6e4c593cdb0b.tar.gz u-boot-imx-6e250796d6a07d84093eeae96e5a6e4c593cdb0b.tar.bz2 | |
MLK-10176-6 imx: mx7: Modify GPT timer driver for mx7
Modify the GPT common platform driver for mx7 which only use 24Mhz
OSC as clock source.
Note: at default, the mx7d will use system counter as timer. The GPT
is disabled.
Signed-off-by: Ye.Li <B37916@freescale.com>
| -rw-r--r-- | arch/arm/imx-common/timer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index f7e49bd..0480a42 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Sascha Hauer, Pengutronix * - * (C) Copyright 2009-2014 Freescale Semiconductor, Inc. + * (C) Copyright 2009-2015 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -50,6 +50,8 @@ static inline int gpt_has_clk_source_osc(void) return 1; return 0; +#elif defined(CONFIG_MX7) + return 1; #else return 0; #endif @@ -57,6 +59,9 @@ static inline int gpt_has_clk_source_osc(void) static inline ulong gpt_get_clk(void) { +#if defined(CONFIG_MX7) + return MXC_HCLK >> 3; +#else #ifdef CONFIG_MXC_GPT_HCLK if (gpt_has_clk_source_osc()) return MXC_HCLK >> 3; @@ -65,6 +70,7 @@ static inline ulong gpt_get_clk(void) #else return MXC_CLK32; #endif +#endif } static inline unsigned long long tick_to_time(unsigned long long tick) { @@ -106,7 +112,7 @@ int timer_init(void) /* For DL/S, SX, they has 24M OSC Enable bit and need to set prescaler */ if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO) - || is_cpu_type(MXC_CPU_MX6SX)) { + || is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX7D)) { i |= GPTCR_24MEN; /* Produce 3Mhz clock */ |