summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Chao <chao7.huang@samsung.com>2014-06-12 14:42:58 +0800
committerSylwester Nawrocki <s.nawrocki@samsung.com>2014-06-12 03:19:41 -0700
commit76232288d923c5c195b9b1de0d8a8329619846af (patch)
tree53f12ff95f711c0beae377b7177ece6e9dd98717
parentba8c32fcdace3854abd1b5269f2db9e83abd6c17 (diff)
downloadlinux-3.10-76232288d923c5c195b9b1de0d8a8329619846af.tar.gz
linux-3.10-76232288d923c5c195b9b1de0d8a8329619846af.tar.bz2
linux-3.10-76232288d923c5c195b9b1de0d8a8329619846af.zip
ASoC: samsung: odroidx2/u3: Remove unnecessary system clock setting
This patch removes the redundant sysclk setting of odroid cpu_dai. Since the audio working mode has been changed from I2S master mode to I2S slave mode, so we don't need to set the cpu_dai I2S clock mode to operation any more. Besides, the hw_params function will set cpu_dai I2S sysclk to CDCCLK mode, which makes the cpu_dai to use the system clock generated by audio codec max98090. Change-Id: Ia09f9774c07d22991a706eff6553892b9d7ca39c Signed-off-by: Huang Chao <chao7.huang@samsung.com>
-rw-r--r--sound/soc/samsung/odroidx2_max98090.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c
index 614c60fa1cd..739b76ae988 100644
--- a/sound/soc/samsung/odroidx2_max98090.c
+++ b/sound/soc/samsung/odroidx2_max98090.c
@@ -12,7 +12,6 @@
#include <sound/soc.h>
#include <sound/pcm_params.h>
#include "i2s.h"
-#include "i2s-regs.h"
/* Config I2S CDCLK output 19.2MHZ clock to Max98090 */
#define MAX98090_MCLK 19200000
@@ -33,14 +32,6 @@ static int odroidx2_hw_params(struct snd_pcm_substream *substream,
return ret;
}
- ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
- 0, MOD_OPCLK_PCLK);
- if (ret < 0) {
- dev_err(cpu_dai->dev,
- "Unable to set i2s opclk: 0x%x\n", ret);
- return ret;
- }
-
/* Set the cpu DAI configuration in order to use CDCLK */
ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
0, SND_SOC_CLOCK_OUT);