From 488191ea3eb1fb759220b3fee9cc6a38d51b57c8 Mon Sep 17 00:00:00 2001 From: Vipul Kumar <vipul_kumar@mentor.com> Date: Wed, 5 Dec 2018 18:27:48 +0530 Subject: [PATCH] ASoC: wm8960: replace codec to component This patch replace codec to component to fix the compilation errors. Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com> Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com> --- sound/soc/fsl/imx-wm8960.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sound/soc/fsl/imx-wm8960.c b/sound/soc/fsl/imx-wm8960.c index 6b354c7e16dc37..70f0dcdc8c6b2b 100644 --- a/sound/soc/fsl/imx-wm8960.c +++ b/sound/soc/fsl/imx-wm8960.c @@ -335,23 +335,25 @@ static int imx_wm8960_late_probe(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 snd_soc_component *component = codec_dai->component; struct imx_wm8960_data *data = snd_soc_card_get_drvdata(card); /* * codec ADCLRC pin configured as GPIO, DACLRC pin is used as a frame * clock for ADCs and DACs */ - snd_soc_update_bits(codec, WM8960_IFACE2, 1<<6, 1<<6); + snd_soc_component_update_bits(component, WM8960_IFACE2, 1<<6, 1<<6); /* GPIO1 used as headphone detect output */ - snd_soc_update_bits(codec, WM8960_ADDCTL4, 7<<4, 3<<4); + snd_soc_component_update_bits(component, WM8960_ADDCTL4, 7<<4, 3<<4); /* Enable headphone jack detect */ - snd_soc_update_bits(codec, WM8960_ADDCTL2, 1<<6, 1<<6); - snd_soc_update_bits(codec, WM8960_ADDCTL2, 1<<5, data->hp_det[1]<<5); - snd_soc_update_bits(codec, WM8960_ADDCTL4, 3<<2, data->hp_det[0]<<2); - snd_soc_update_bits(codec, WM8960_ADDCTL1, 3, 3); + snd_soc_component_update_bits(component, WM8960_ADDCTL2, 1<<6, 1<<6); + snd_soc_component_update_bits(component, WM8960_ADDCTL2, 1<<5, + data->hp_det[1]<<5); + snd_soc_component_update_bits(component, WM8960_ADDCTL4, 3<<2, + data->hp_det[0]<<2); + snd_soc_component_update_bits(component, WM8960_ADDCTL1, 3, 3); return 0; } -- GitLab