diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-13 07:48:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 07:48:07 +0100 |
| commit | 6214b54cbf0778804de1297444c7661e70bc4d74 (patch) | |
| tree | 262a96d1be839a30e6e8d3f3452806b7f337148c /arch/arm/mach-omap2/clock33xx_data.c | |
| parent | 05193639ca977cc889668718adb38db6d585045b (diff) | |
| parent | ba027da8eb309252cb611f23808da51487f68e12 (diff) | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
Diffstat (limited to 'arch/arm/mach-omap2/clock33xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock33xx_data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c index 114ab4b8e0e..1a45d6bd253 100644 --- a/arch/arm/mach-omap2/clock33xx_data.c +++ b/arch/arm/mach-omap2/clock33xx_data.c @@ -1073,6 +1073,8 @@ static struct omap_clk am33xx_clks[] = { CLK(NULL, "gfx_fck_div_ck", &gfx_fck_div_ck, CK_AM33XX), CLK(NULL, "sysclkout_pre_ck", &sysclkout_pre_ck, CK_AM33XX), CLK(NULL, "clkout2_ck", &clkout2_ck, CK_AM33XX), + CLK(NULL, "timer_32k_ck", &clkdiv32k_ick, CK_AM33XX), + CLK(NULL, "timer_sys_ck", &sys_clkin_ck, CK_AM33XX), }; int __init am33xx_clk_init(void) |