From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935955Ab1JFX4B (ORCPT ); Thu, 6 Oct 2011 19:56:01 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:44037 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935786Ab1JFX4A (ORCPT ); Thu, 6 Oct 2011 19:56:00 -0400 Subject: [PATCH 10/11] ASoC: wm8988: Convert to snd_soc_write From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Mark Brown , Liam Girdwood , alsa-devel@alsa-project.org In-Reply-To: <1317944619.5579.1.camel@phoenix> References: <1317944619.5579.1.camel@phoenix> Content-Type: text/plain; charset="UTF-8" Date: Fri, 07 Oct 2011 07:55:53 +0800 Message-ID: <1317945353.5579.16.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert codec->hw_write to snd_soc_write Signed-off-by: Axel Lin --- sound/soc/codecs/wm8988.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 1c6f8bf..33584e0 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -55,7 +55,6 @@ struct wm8988_priv { struct snd_pcm_hw_constraint_list *sysclk_constraints; }; - #define wm8988_reset(c) snd_soc_write(c, WM8988_RESET, 0) /* @@ -660,6 +659,26 @@ static int wm8988_mute(struct snd_soc_dai *dai, int mute) return 0; } +static void wm8988_sync_cache(struct snd_soc_codec *codec) +{ + short i; + u16 *cache; + + if (!codec->cache_sync) + return; + codec->cache_only = 0; + codec->cache_bypass = 1; + /* restore cache */ + cache = codec->reg_cache; + for (i = 0; i < codec->driver->reg_cache_size; i++) { + if (i == WM8988_RESET || cache[i] == wm8988_reg[i]) + continue; + snd_soc_write(codec, i, cache[i]); + } + codec->cache_bypass = 0; + codec->cache_sync = 0; +} + static int wm8988_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -676,6 +695,8 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_STANDBY: if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { + wm8988_sync_cache(codec); + /* VREF, VMID=2x5k */ snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); @@ -736,21 +757,7 @@ static int wm8988_suspend(struct snd_soc_codec *codec, pm_message_t state) static int wm8988_resume(struct snd_soc_codec *codec) { - int i; - u8 data[2]; - u16 *cache = codec->reg_cache; - - /* Sync reg_cache with the hardware */ - for (i = 0; i < WM8988_NUM_REG; i++) { - if (i == WM8988_RESET) - continue; - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); - data[1] = cache[i] & 0x00ff; - codec->hw_write(codec->control_data, data, 2); - } - wm8988_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - return 0; } -- 1.7.4.1