aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2014-05-19 13:30:38 -0400
committerMark Brown <broonie@linaro.org>2014-05-20 18:20:57 -0400
commitc86d50f9dc525cb0264c25ed5186faf0f1d00477 (patch)
treea22d397dce0205718b870ead2828b8f465dd3939 /sound/soc/samsung
parentdeeaa686b9381ff9a66e599af57976ba7e54ec54 (diff)
ASoC: samsung: Allow setting OP_CLK of the IIS Multi Audio Interface
This patch adds support for setting source clock of the "Core CLK" of the IIS Multi Audio Interface. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/i2s.c4
-rw-r--r--sound/soc/samsung/i2s.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 6e61db75ec4e..1e99071fb624 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -451,6 +451,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
451 u32 mod = readl(i2s->addr + I2SMOD); 451 u32 mod = readl(i2s->addr + I2SMOD);
452 452
453 switch (clk_id) { 453 switch (clk_id) {
454 case SAMSUNG_I2S_OPCLK:
455 mod &= ~MOD_OPCLK_MASK;
456 mod |= dir;
457 break;
454 case SAMSUNG_I2S_CDCLK: 458 case SAMSUNG_I2S_CDCLK:
455 /* Shouldn't matter in GATING(CLOCK_IN) mode */ 459 /* Shouldn't matter in GATING(CLOCK_IN) mode */
456 if (dir == SND_SOC_CLOCK_IN) 460 if (dir == SND_SOC_CLOCK_IN)
diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h
index 7966afc934db..21ff24e930db 100644
--- a/sound/soc/samsung/i2s.h
+++ b/sound/soc/samsung/i2s.h
@@ -18,5 +18,6 @@
18#define SAMSUNG_I2S_RCLKSRC_0 0 18#define SAMSUNG_I2S_RCLKSRC_0 0
19#define SAMSUNG_I2S_RCLKSRC_1 1 19#define SAMSUNG_I2S_RCLKSRC_1 1
20#define SAMSUNG_I2S_CDCLK 2 20#define SAMSUNG_I2S_CDCLK 2
21#define SAMSUNG_I2S_OPCLK 3
21 22
22#endif /* __SND_SOC_SAMSUNG_I2S_H */ 23#endif /* __SND_SOC_SAMSUNG_I2S_H */