diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-07-20 19:28:25 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-08-02 11:05:07 +0200 |
| commit | 35d5e54363cc2734aa0ac86fffcac54f3b06f15e (patch) | |
| tree | e85a19804e27f2a27a32e6b5fa93f49d9bc239fc /arch/arm/imx-common | |
| parent | d73d5aee3c5585e67ece5f6e263259fceaadf890 (diff) | |
| download | talos-obmc-uboot-35d5e54363cc2734aa0ac86fffcac54f3b06f15e.tar.gz talos-obmc-uboot-35d5e54363cc2734aa0ac86fffcac54f3b06f15e.zip | |
imx-common: timer: add i.MX6UL support
Add i.MX6UL GPT timer support.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/timer.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 */ |
