diff options
| -rw-r--r-- | sound/soc/fsl/imx-wm8958.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/soc/fsl/imx-wm8958.c b/sound/soc/fsl/imx-wm8958.c index 210f6662eb09..13035790ac68 100644 --- a/sound/soc/fsl/imx-wm8958.c +++ b/sound/soc/fsl/imx-wm8958.c @@ -44,7 +44,7 @@ struct imx_wm8958_data { struct imx_priv { int hp_gpio; int hp_active_low; - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct platform_device *pdev; }; @@ -85,11 +85,11 @@ static int hpjack_status_check(void *data) if (hp_status != priv->hp_active_low) { snprintf(buf, 32, "STATE=%d", 2); - snd_soc_dapm_disable_pin(snd_soc_codec_get_dapm(priv->codec), "Ext Spk"); + snd_soc_dapm_disable_pin(snd_soc_component_get_dapm(priv->component), "Ext Spk"); ret = imx_hp_jack_gpio.report; } else { snprintf(buf, 32, "STATE=%d", 0); - snd_soc_dapm_enable_pin(snd_soc_codec_get_dapm(priv->codec), "Ext Spk"); + snd_soc_dapm_enable_pin(snd_soc_component_get_dapm(priv->component), "Ext Spk"); ret = 0; } @@ -123,7 +123,6 @@ static int imx_hifi_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_card *card = rtd->card; struct device *dev = card->dev; struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); @@ -207,13 +206,13 @@ static int imx_hifi_hw_params(struct snd_pcm_substream *substream, * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 using shared * LRCLK from DACLRCK1. */ - snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); + snd_soc_component_update_bits(codec_dai->component, WM8994_GPIO_1, 0x1f, 0x2); /* * Clear ADC_OSR128 bit to support slower SYSCLK, and support ADC sample * rate 8K, 11.025K and 12K. */ - snd_soc_update_bits(codec, WM8994_OVERSAMPLING, 1<<1, 0); + snd_soc_component_update_bits(codec_dai->component, WM8994_OVERSAMPLING, 1<<1, 0); return 0; } @@ -289,10 +288,10 @@ static int imx_wm8958_gpio_init(struct snd_soc_card *card) struct snd_soc_pcm_runtime *rtd = list_first_entry( &card->rtd_list, struct snd_soc_pcm_runtime, list); struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_codec *codec = codec_dai->codec; struct imx_priv *priv = &card_priv; int ret; - priv->codec = codec; + + priv->component = codec_dai->component; if (gpio_is_valid(priv->hp_gpio)) { imx_hp_jack_gpio.gpio = priv->hp_gpio; |