diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-10 10:16:26 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-10 11:25:19 +0800 |
| commit | c0730e07456705269f3c9a4b0e625f7fd9ca375e (patch) | |
| tree | 0d8ed89666fb8f88fafbee7eb8dabbe506551694 | |
| parent | a7c2de9db937e0e649607fb487f2371d742c9ce7 (diff) | |
ENGR00179243-1: Revert "MX6-Fix TO1.0 boot-fail issue"
This reverts commit 599b1c5fb9275920b3f612e28b7d9c45a9688719.
Signed-off-by: Xinyu CHen <xinyu.chen@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index d84e3111390b..5aa296603763 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -521,19 +521,6 @@ 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, @@ -1935,7 +1922,6 @@ 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) |