From 281500c2d4e716d22c3d0d1f378b0fbc9948c422 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 26 Apr 2013 14:38:11 +0200 Subject: [PATCH] --- yaml --- r: 375226 b: refs/heads/master c: 81ee6833bc6ccd0c64d2f527775a3ded7aa9bfb4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/davinci/davinci-mcasp.c | 5 ++++- trunk/sound/soc/soc-dapm.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 08c146350852..cf2ad1ddddc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37c1b9273fefe90e45c7d01ba4209e42d5e3e058 +refs/heads/master: 81ee6833bc6ccd0c64d2f527775a3ded7aa9bfb4 diff --git a/trunk/sound/soc/davinci/davinci-mcasp.c b/trunk/sound/soc/davinci/davinci-mcasp.c index 9321e5c9d8c1..9acb72c5f65c 100644 --- a/trunk/sound/soc/davinci/davinci-mcasp.c +++ b/trunk/sound/soc/davinci/davinci-mcasp.c @@ -503,7 +503,10 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE); mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE); - mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, ACLKX | AFSX); + mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, + ACLKX | ACLKR); + mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, + AFSX | AFSR); break; case SND_SOC_DAIFMT_CBM_CFS: /* codec is clock master and frame slave */ diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 41b8b8ef4872..d6d9ba2e6916 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/sound/soc/soc-dapm.c @@ -1070,9 +1070,9 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w, #ifdef CONFIG_HAVE_CLK if (SND_SOC_DAPM_EVENT_ON(event)) { - return clk_prepare_enable(w->clk); + return clk_enable(w->clk); } else { - clk_disable_unprepare(w->clk); + clk_disable(w->clk); return 0; } #endif