From: Peng Fan Date: Mon, 20 Jul 2015 11:28:25 +0000 (+0800) Subject: imx-common: timer: add i.MX6UL support X-Git-Tag: v2015.10-rc1~2^2~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35d5e54363cc2734aa0ac86fffcac54f3b06f15e;p=oweals%2Fu-boot.git imx-common: timer: add i.MX6UL support Add i.MX6UL GPT timer support. Signed-off-by: Peng Fan --- diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index c12556addf..1a88ce6862 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -45,7 +45,8 @@ static inline int gpt_has_clk_source_osc(void) #if defined(CONFIG_MX6) if (((is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) && (soc_rev() > CHIP_REV_1_0)) || is_cpu_type(MXC_CPU_MX6DL) || - is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX)) + is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX) || + is_cpu_type(MXC_CPU_MX6UL)) return 1; return 0; @@ -103,10 +104,11 @@ int timer_init(void) if (gpt_has_clk_source_osc()) { i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN; - /* For DL/S, SX, set 24Mhz OSC Enable bit and prescaler */ + /* For DL/S, SX, UL, set 24Mhz OSC Enable bit and 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_MX6UL)) { i |= GPTCR_24MEN; /* Produce 3Mhz clock */