diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 19:45:44 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 19:45:44 +0400 |
| commit | 143ed290f02496fb918789cf14949e4e8033d34d (patch) | |
| tree | 02a2f503d4b6fac4598f326b8fa7ad009055c8c2 /arch/arm/mach-imx/clock-imx25.c | |
| parent | ac9cf9ff4f4ffa355d0e93c2bd6d74961a16efad (diff) | |
| parent | d9c927833a42b4eaae4addd031f780f4530f7a2d (diff) | |
| download | linux-143ed290f02496fb918789cf14949e4e8033d34d.tar.xz | |
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-imx/clock-imx25.c')
| -rw-r--r-- | arch/arm/mach-imx/clock-imx25.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c index 0fc7ba56d616..e63e23504fe5 100644 --- a/arch/arm/mach-imx/clock-imx25.c +++ b/arch/arm/mach-imx/clock-imx25.c @@ -331,6 +331,9 @@ int __init mx25_clocks_init(void) __raw_writel(__raw_readl(CRM_BASE+0x64) | (1 << 7) | (1 << 0), CRM_BASE + 0x64); + /* Clock source for gpt is ahb_div */ + __raw_writel(__raw_readl(CRM_BASE+0x64) & ~(1 << 5), CRM_BASE + 0x64); + mxc_timer_init(&gpt_clk, MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54); return 0; |