tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: mediatek: mt8173-rt5650: support HDMI jack reporting

Browse Source 
Uses hdmi-codec to support HDMI jack reporting.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20200206102509.3.I253f51edff62df1d88005de12ba601aa029b1e99@changeid
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tzung-Bi Shih
2020-02-06 11:17:52 +08:00
committed by Mark Brown
parent fb0c3c6e20
commit c8b60c6d93
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/soc/mediatek/mt8173/mt8173-rt5650.c
+16 -1
View File
@@ -11,6 +11,7 @@
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/hdmi-codec.h>
#include "../../codecs/rt5645.h" #include "../../codecs/rt5645.h"
#define MCLK_FOR_CODECS 12288000 #define MCLK_FOR_CODECS 12288000
@@ -98,7 +99,7 @@ static const struct snd_soc_ops mt8173_rt5650_ops = {
.hw_params = mt8173_rt5650_hw_params, .hw_params = mt8173_rt5650_hw_params,
}; };
static struct snd_soc_jack mt8173_rt5650_jack; static struct snd_soc_jack mt8173_rt5650_jack, mt8173_rt5650_hdmi_jack;
static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
{ {
@@ -144,6 +145,19 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
&mt8173_rt5650_jack); &mt8173_rt5650_jack);
} }
static int mt8173_rt5650_hdmi_init(struct snd_soc_pcm_runtime *rtd)
{
int ret;
ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT,
&mt8173_rt5650_hdmi_jack, NULL, 0);
if (ret)
return ret;
return hdmi_codec_set_jack_detect(rtd->codec_dai->component,
&mt8173_rt5650_hdmi_jack);
}
enum { enum {
DAI_LINK_PLAYBACK, DAI_LINK_PLAYBACK,
DAI_LINK_CAPTURE, DAI_LINK_CAPTURE,
@@ -222,6 +236,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
.name = "HDMI BE", .name = "HDMI BE",
.no_pcm = 1, .no_pcm = 1,
.dpcm_playback = 1, .dpcm_playback = 1,
.init = mt8173_rt5650_hdmi_init,
SND_SOC_DAILINK_REG(hdmi_be), SND_SOC_DAILINK_REG(hdmi_be),
}, },
}; };