diff options
| author | Jason Liu <r64343@freescale.com> | 2013-04-07 09:10:25 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-04-07 09:33:46 +0800 |
| commit | 23fae65a58952ca3de64e68c13c0d3527bec6f0a (patch) | |
| tree | 77f45f41d7a173c70e71564b1ccd8f489b04c4d6 /arch/arm/mach-mx6/clock.c | |
| parent | 49e57ecf2e9aae6a68a1751b8fa5bd58f0b5b851 (diff) | |
ENGR00257658 Revert "ENGR00256893-1 MX6Q/DL-Fix Ethernet performance issue
This reverts commit 067c8dcfa79a169d86809272569fe734c4222c79.
i.mx6dl/dq sabreauto/sabresd board will boot up failed
randomly with this patch-set, thus revert it. [Jason]
Signed-off-by: Jason Liu <r64343@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6/clock.c')
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index ef39c7b173ae..83544284776e 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -50,7 +50,6 @@ extern int lp_med_freq; extern int wait_mode_arm_podf; extern int lp_audio_freq; extern int cur_arm_podf; -extern bool enet_is_active; void __iomem *apll_base; @@ -3724,23 +3723,6 @@ static unsigned long _clk_enet_get_rate(struct clk *clk) return 500000000 / div; } -static int _clk_enet_enable(struct clk *clk) -{ -#ifndef CONFIG_MX6_ENET_IRQ_TO_GPIO - enet_is_active = true; -#endif - _clk_enable(clk); - return 0; -} - -static void _clk_enet_disable(struct clk *clk) -{ - _clk_disable(clk); -#ifndef CONFIG_MX6_ENET_IRQ_TO_GPIO - enet_is_active = false; -#endif -} - static struct clk enet_clk[] = { { __INIT_CLK_DEBUG(enet_clk) @@ -3748,8 +3730,8 @@ static struct clk enet_clk[] = { .parent = &pll8_enet_main_clk, .enable_reg = MXC_CCM_CCGR1, .enable_shift = MXC_CCM_CCGRx_CG5_OFFSET, - .enable = _clk_enet_enable, - .disable = _clk_enet_disable, + .enable = _clk_enable, + .disable = _clk_disable, .set_rate = _clk_enet_set_rate, .get_rate = _clk_enet_get_rate, .secondary = &enet_clk[1], |