summaryrefslogtreecommitdiffstats
path: root/sound/soc/mediatek/mt8173
diff options
context:
space:
mode:
authorCheng-Yi Chiang <cychiang@chromium.org>2020-09-22 14:23:16 +0800
committerMark Brown <broonie@kernel.org>2020-09-22 12:48:03 +0100
commit55c5cc63ab3277aa20637dc20f6528987ac23743 (patch)
treec831f74be19b718ac67909120649e54ae64ee9fc /sound/soc/mediatek/mt8173
parent376dd57d88633e455da0fdf54adc1f8682ab8d95 (diff)
downloadlinux-stable-55c5cc63ab3277aa20637dc20f6528987ac23743.tar.gz
linux-stable-55c5cc63ab3277aa20637dc20f6528987ac23743.tar.bz2
linux-stable-55c5cc63ab3277aa20637dc20f6528987ac23743.zip
ASoC: hdmi-codec: Use set_jack ops to set jack
Use set_jack ops to set jack so machine drivers do not need to include hdmi-codec.h explicitly. Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-by: Tzung-Bi Shih <tzungbi@google.com> Link: https://lore.kernel.org/r/20200922062316.1172935-1-cychiang@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/mediatek/mt8173')
-rw-r--r--sound/soc/mediatek/mt8173/mt8173-rt5650.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
index 347b095d478d..c28ebf891cb0 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -11,7 +11,6 @@
#include <linux/of_gpio.h>
#include <sound/soc.h>
#include <sound/jack.h>
-#include <sound/hdmi-codec.h>
#include "../../codecs/rt5645.h"
#define MCLK_FOR_CODECS 12288000
@@ -154,8 +153,8 @@ static int mt8173_rt5650_hdmi_init(struct snd_soc_pcm_runtime *rtd)
if (ret)
return ret;
- return hdmi_codec_set_jack_detect(asoc_rtd_to_codec(rtd, 0)->component,
- &mt8173_rt5650_hdmi_jack);
+ return snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component,
+ &mt8173_rt5650_hdmi_jack, NULL);
}
enum {