diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-01 14:40:59 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-01 14:40:59 (GMT) |
| commit | 6aee2ab68c362ace5a59f89a63abed82e0bf19e5 (patch) | |
| tree | 0b76045a178e9c0ed61e141bd8dfb3e34e4e86a9 /arch/arm/mach-imx/timer.c | |
| parent | 4109d702934c361b2ae2a5ad34f4dfee708cc214 (diff) | |
| parent | 63af4b0ad0666e0797306593813b6272e1995bde (diff) | |
| download | u-boot-6aee2ab68c362ace5a59f89a63abed82e0bf19e5.tar.xz | |
Merge git://git.denx.de/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig
Diffstat (limited to 'arch/arm/mach-imx/timer.c')
| -rw-r--r-- | arch/arm/mach-imx/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index 9b01114..69dbf3c 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -74,8 +74,7 @@ int timer_init(void) __raw_writel(GPTCR_SWR, &cur_gpt->control); /* We have no udelay by now */ - for (i = 0; i < 100; i++) - __raw_writel(0, &cur_gpt->control); + __raw_writel(0, &cur_gpt->control); i = __raw_readl(&cur_gpt->control); i &= ~GPTCR_CLKSOURCE_MASK; |