diff options
author | Tony Lindgren <tony@atomide.com> | 2013-01-03 11:04:21 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-01-03 11:04:21 -0800 |
commit | 2cd1f483b8c80b2f6b032edddb18f4946f94c4fc (patch) | |
tree | 8ae4a5803a08cd8049dd481cbd9d2d8cc3ac209b /arch/arm/mach-omap2/cclock3xxx_data.c | |
parent | Linux 3.8-rc2 (diff) | |
parent | ARM: OMAP2/3: PRM: fix bogus OMAP2xxx powerstate return values (diff) | |
download | linux-dev-2cd1f483b8c80b2f6b032edddb18f4946f94c4fc.tar.xz linux-dev-2cd1f483b8c80b2f6b032edddb18f4946f94c4fc.zip |
Merge tag 'omap-fixes-a2-for-v3.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8-rc2/fixes
Some OMAP PRCM and sparse fixes against v3.8-rc1. A basic set of test
logs are available here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_b_3.8-rc/20130102120724/
The 3730 Beagle XM here has an intermittent failure mounting SD root,
but the suspicion right now is that this is due to a failing SD card,
rather than any change introduced by these patches.
This second version includes a few changes requested by Tony Lindgren.
Diffstat (limited to 'arch/arm/mach-omap2/cclock3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/cclock3xxx_data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c index bdf39481fbd6..6ef87580c33f 100644 --- a/arch/arm/mach-omap2/cclock3xxx_data.c +++ b/arch/arm/mach-omap2/cclock3xxx_data.c @@ -1167,6 +1167,8 @@ static const struct clk_ops emu_src_ck_ops = { .recalc_rate = &omap2_clksel_recalc, .get_parent = &omap2_clksel_find_parent_index, .set_parent = &omap2_clksel_set_parent, + .enable = &omap2_clkops_enable_clkdm, + .disable = &omap2_clkops_disable_clkdm, }; static struct clk emu_src_ck; |