diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-10 04:26:20 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-10 04:26:20 -0500 |
| commit | 86b378e750feb8c7c91f3cd860f7e77c5e623953 (patch) | |
| tree | 9eadcf56db82c6964319953de09e30835b73b9c9 /arch/arm | |
| parent | efbea5203681b8330455a031af4b8eae4e6c5bd3 (diff) | |
| parent | 092b47689f9b83b0e64120a4412a8faa4ab7157f (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x8
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/dmtimers.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index ab4455dd0045..5e6e566a5840 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -1515,6 +1515,7 @@ static struct clk gpt1_fck = { .clksel = abe_dpll_bypass_clk_mux_sel, .init = &omap2_init_clksel_parent, .clksel_reg = OMAP4430_CM_WKUP_TIMER1_CLKCTRL, + .flags = ENABLE_ON_INIT, .clksel_mask = OMAP4430_CLKSEL_MASK, .ops = &clkops_omap2_dflt, .recalc = &omap2_clksel_recalc, diff --git a/arch/arm/mach-omap2/dmtimers.c b/arch/arm/mach-omap2/dmtimers.c index fd936eeb141d..368691e291bf 100644 --- a/arch/arm/mach-omap2/dmtimers.c +++ b/arch/arm/mach-omap2/dmtimers.c @@ -100,7 +100,8 @@ unsigned long omap2_dm_timer_set_clk(struct platform_device *pdev, int source) clk_disable(odev->hwmods[0]->_clk); ret = clk_set_parent(odev->hwmods[0]->_clk, omap2_dm_source_clocks[source]); - WARN(ret, " omap2 dmtimers: Not able to change the \ + if (ret) + pr_err(" omap2 dmtimers: Not able to change the \ fclk source\n"); clk_enable(odev->hwmods[0]->_clk); /* |