diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-10-12 13:39:25 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-12 10:59:11 +0100 |
| commit | 1422408b34fd27ac7ab4a42e72d4b61553b6f631 (patch) | |
| tree | f34113c8e57c91d73c1ca7bc28bd8356d2031911 /sound/soc/codecs/ak4642.c | |
| parent | fe3e2e7ff2da41bd7a985c4c206e05a95ebe7a6b (diff) | |
| download | linux-1422408b34fd27ac7ab4a42e72d4b61553b6f631.tar.gz | |
ASoC: ak4642: simultaneous playback/recorde support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ak4642.c')
| -rw-r--r-- | sound/soc/codecs/ak4642.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index a95ff4f9f42c..009068f57375 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -220,7 +220,7 @@ static int ak4642_dai_startup(struct snd_pcm_substream *substream, ak4642_write(codec, 0x0e, 0x19); ak4642_write(codec, 0x09, 0x91); ak4642_write(codec, 0x0c, 0x91); - ak4642_write(codec, 0x00, 0x64); + snd_soc_update_bits(codec, 0x00, 0x64, 0x64); snd_soc_update_bits(codec, PW_MGMT2, PMHP_MASK, PMHP); snd_soc_update_bits(codec, PW_MGMT2, HPMTN, HPMTN); } else { @@ -242,7 +242,7 @@ static int ak4642_dai_startup(struct snd_pcm_substream *substream, ak4642_write(codec, 0x08, 0xe1); ak4642_write(codec, 0x0b, 0x00); ak4642_write(codec, 0x07, 0x21); - ak4642_write(codec, 0x00, 0x41); + snd_soc_update_bits(codec, 0x00, 0x41, 0x41); ak4642_write(codec, 0x10, 0x01); } @@ -259,12 +259,12 @@ static void ak4642_dai_shutdown(struct snd_pcm_substream *substream, /* stop headphone output */ snd_soc_update_bits(codec, PW_MGMT2, HPMTN, 0); snd_soc_update_bits(codec, PW_MGMT2, PMHP_MASK, 0); - ak4642_write(codec, 0x00, 0x40); + snd_soc_update_bits(codec, 0x00, 0x64, 0x40); ak4642_write(codec, 0x0e, 0x11); ak4642_write(codec, 0x0f, 0x08); } else { /* stop stereo input */ - ak4642_write(codec, 0x00, 0x40); + snd_soc_update_bits(codec, 0x00, 0x41, 0x40); ak4642_write(codec, 0x10, 0x00); ak4642_write(codec, 0x07, 0x01); } |