diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 23:04:45 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 23:04:45 +0200 |
| commit | 0a1182796f6475b8cb2ff1781dad873a744b3197 (patch) | |
| tree | e15b5256dac226c49a25b5e24594cd638e2fec2c /sound | |
| parent | 633018c13fe06461d9c60692fbb114734aa37802 (diff) | |
| download | kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.zip kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.tar.gz kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.tar.bz2 | |
samsung opensource update3
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/audss.c | 8 | ||||
| -rw-r--r-- | sound/soc/samsung/i2s.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/samsung/audss.c b/sound/soc/samsung/audss.c index 2669142..1c052b0 100644 --- a/sound/soc/samsung/audss.c +++ b/sound/soc/samsung/audss.c @@ -132,9 +132,7 @@ void audss_reg_restore(void) audss.suspend_audss_clkdiv, audss.suspend_audss_clkgate); } -#if defined(CONFIG_MACH_M0) && defined(CONFIG_TARGET_LOCALE_EUR) -extern void print_epll_con0(void); -#endif + void audss_clk_enable(bool enable) { unsigned long flags; @@ -171,9 +169,7 @@ void audss_clk_enable(bool enable) audss.clk_enabled = false; } -#if defined(CONFIG_MACH_M0) && defined(CONFIG_TARGET_LOCALE_EUR) - print_epll_con0(); -#endif + pr_info("%s(%d): SRC[0x%x], DIV[0x%x], GATE[0x%x]\n", __func__, enable ? 1 : 0, readl(S5P_CLKSRC_AUDSS), diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index bb0e4e8..77279a4 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -784,7 +784,11 @@ static int i2s_startup(struct snd_pcm_substream *substream, i2s->addr + I2SMOD); } #else - if (!is_opened(other) && !srp_active(i2s, IS_OPENED)) + if (!is_opened(other) +#if defined(CONFIG_SND_SAMSUNG_RP) + && !srp_active(i2s, IS_OPENED) +#endif + ) i2s_clk_enable(i2s, true); if (i2s->reg_saved) { |