diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-07 22:02:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-08 09:33:37 -0400 |
| commit | f5fd45ff64e28a73499548358e3d1ceda0de7daf (patch) | |
| tree | ec595a705a2ec1f256c5c83b4e4ee7427aec58f4 /arch/arm/imx-common/timer.c | |
| parent | 1f957708072e153637718497f7a1a6e364220337 (diff) | |
| parent | 3dddc793e0114eb7dfc68b98a4316644d4031fcb (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common/timer.c')
| -rw-r--r-- | arch/arm/imx-common/timer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index a01590ced22..fb1b693161e 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -44,7 +44,8 @@ static inline int gpt_has_clk_source_osc(void) { #if defined(CONFIG_MX6) if (((is_mx6dq()) && (soc_rev() > CHIP_REV_1_0)) || - is_mx6dqp() || is_mx6sdl() || is_mx6sx() || is_mx6ul()) + is_mx6dqp() || is_mx6sdl() || is_mx6sx() || is_mx6ul() || + is_mx6ull()) return 1; return 0; @@ -83,8 +84,8 @@ int timer_init(void) if (gpt_has_clk_source_osc()) { i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN; - /* For DL/S, SX, UL, set 24Mhz OSC Enable bit and prescaler */ - if (is_mx6sdl() || is_mx6sx() || is_mx6ul()) { + /* For DL/S, SX, UL, ULL set 24Mhz OSC Enable bit and prescaler */ + if (is_mx6sdl() || is_mx6sx() || is_mx6ul() || is_mx6ull()) { i |= GPTCR_24MEN; /* Produce 3Mhz clock */ |