ENGR00179725 WM8962: remove 64KHz sample rate support

because wm8962 codec does not support 64KHz sample
rate, no longer declare to support 64KHz:

Signed-off-by: Gary Zhang <b13634@freescale.com>

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index b8be06b3344a375766bd1cc9573110405b6dcc5c..824a6fa8f487b22c330e1bfc43a0280c51eaacba 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3520,7 +3520,8 @@ static int wm8962_mute(struct snd_soc_dai *dai, int mute)
                                   WM8962_DAC_MUTE, val);
 }
 
-#define WM8962_RATES SNDRV_PCM_RATE_8000_96000
+#define WM8962_RATES (SNDRV_PCM_RATE_8000_48000 |\
+                       SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 
 #define WM8962_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)

diff --git a/sound/soc/imx/imx-wm8962.c b/sound/soc/imx/imx-wm8962.c
index 2885d3a478895f2a74955bca8f678c6d77a9370d..74950ad798612c3f6862f18b97f79d6420fa90f9 100644 (file)
--- a/sound/soc/imx/imx-wm8962.c
+++ b/sound/soc/imx/imx-wm8962.c
@@ -326,9 +326,9 @@ static int imx_wm8962_init(struct snd_soc_pcm_runtime *rtd)
 
                /* if amic is inserted, disable DMIC */
                if (priv->amic_status != plat->mic_active_low)
-                       snd_soc_dapm_nc_pin(&gcodec->dapm, "DMIC");
+                       snd_soc_dapm_nc_pin(&codec->dapm, "DMIC");
                else
-                       snd_soc_dapm_enable_pin(&gcodec->dapm, "DMIC");
+                       snd_soc_dapm_enable_pin(&codec->dapm, "DMIC");
        }
 
        return 0;