diff options
| author | yagi <yagi@ke66.alps.lineo.co.jp> | 2012-06-20 10:07:06 +0900 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-07-03 17:15:19 -0400 |
| commit | 5029abe64dd1fb89ea79b2f5447edfa3efec4738 (patch) | |
| tree | fb67b96426d5277851cb931287b6ce686bbe76cb | |
| parent | f9bdc5e369e983ed8b1c943abbe783a274af3219 (diff) | |
update: enet clock
| -rw-r--r-- | arch/arm/mach-mvf/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/mvf_time.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c index c1c0e8b9eafe..a34f6f5a660f 100644 --- a/arch/arm/mach-mvf/clock.c +++ b/arch/arm/mach-mvf/clock.c @@ -4043,7 +4043,7 @@ int __init mvf_clocks_init(unsigned long sirc, unsigned long firc, /* setup enet rmii clock 50MHz */ old_parent = clk_get_parent(&enet_rmii_clk); -#if 1 //ENET PLL5 Main clock 50Mhz +#if 0 //ENET PLL5 Main clock 50MHz if (old_parent != &enet_clk) clk_set_parent(&enet_rmii_clk, &enet_clk); #else //ENET External clock 50MHz diff --git a/arch/arm/plat-mxc/mvf_time.c b/arch/arm/plat-mxc/mvf_time.c index 1c6657c55771..194f792bc9c2 100644 --- a/arch/arm/plat-mxc/mvf_time.c +++ b/arch/arm/plat-mxc/mvf_time.c @@ -97,14 +97,14 @@ static void mvf_set_mode(enum clock_event_mode mode, /* timer load already set up */ ctrl = GT_CNTRL_TIMER_EN | GT_CNTRL_CMP_EN | GT_CNTRL_INT_EN | GT_CNTRL_AOUT_INC; - gic_enable_ppi(clk->irq); mvf_timer_clear_int(); + gic_enable_ppi(clk->irq); break; case CLOCK_EVT_MODE_ONESHOT: /* period set, and timer enabled in 'next_event' hook */ ctrl = GT_CNTRL_CMP_EN | GT_CNTRL_INT_EN; - gic_enable_ppi(clk->irq); mvf_timer_clear_int(); + gic_enable_ppi(clk->irq); break; case CLOCK_EVT_MODE_UNUSED: case CLOCK_EVT_MODE_SHUTDOWN: |