From 42de45ee22433a8fd217120d77addc58aa3ea7fd Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Wed, 30 Jan 2013 14:16:00 +0100 Subject: [PATCH] --- yaml --- r: 355165 b: refs/heads/master c: 4b526ca5f627188425184a22ed46c91baa602d43 h: refs/heads/master i: 355163: 330754bf33440b6ab8ed5763b895af212d90bde7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/clk-imx25.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4479bf05193e..f235e1baddef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a3ef226762a89ed6d9281e9dd5c6cab6e65b905 +refs/heads/master: 4b526ca5f627188425184a22ed46c91baa602d43 diff --git a/trunk/arch/arm/mach-imx/clk-imx25.c b/trunk/arch/arm/mach-imx/clk-imx25.c index 2c570cdaae7b..69858c78f40d 100644 --- a/trunk/arch/arm/mach-imx/clk-imx25.c +++ b/trunk/arch/arm/mach-imx/clk-imx25.c @@ -224,6 +224,9 @@ static int __init __mx25_clocks_init(unsigned long osc_rate) clk_prepare_enable(clk[emi_ahb]); + /* Clock source for gpt must be derived from AHB */ + clk_set_parent(clk[per5_sel], clk[ahb]); + clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0"); clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");