diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-05-10 16:28:36 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-05-10 17:15:08 +0800 |
| commit | 2663d4d5b59ad605f778900cf6ac78b055dccb8c (patch) | |
| tree | e70e08bdef25c7397051176ee32ad059a4c4b38b /arch | |
| parent | e1dfe672764f5cdf6ed37a178aa62ffd042e6d62 (diff) | |
ENGR00182646-2 Revert "Revert "MX6-Fix TO1.0 boot-fail issue""
This reverts commit c0730e07456705269f3c9a4b0e625f7fd9ca375e.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 76ad46a6dea6..4deeb8c50c14 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -511,6 +511,19 @@ static int _clk_pll1_main_set_rate(struct clk *clk, unsigned long rate) return 0; } +static void _clk_pll1_disable(struct clk *clk) +{ + pll1_enabled = false; + _clk_pll_disable(clk); +} + +static int _clk_pll1_enable(struct clk *clk) +{ + _clk_pll_enable(clk); + pll1_enabled = true; + return 0; +} + static struct clk pll1_sys_main_clk = { __INIT_CLK_DEBUG(pll1_sys_main_clk) .parent = &osc_clk, @@ -1912,6 +1925,7 @@ static struct clk gpt_clk[] = { .enable = _clk_enable, .disable = _clk_disable, .get_rate = _clk_gpt_get_rate, + .secondary = &gpt_clk[1], }, { __INIT_CLK_DEBUG(gpt_serial_clk) |