Merge tag 'v4.14-rc1' into asoc-rockchip

[android-x86/kernel.git] / sound / soc / rockchip / rk3399_gru_sound.c

diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 0513fe4..ad19e39 100644 (file)
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -47,6 +47,7 @@ static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = {
        SND_SOC_DAPM_SPK("Speakers", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
        SND_SOC_DAPM_MIC("Int Mic", NULL),
+       SND_SOC_DAPM_LINE("HDMI", NULL),
 };
 
 static const struct snd_soc_dapm_route rockchip_dapm_routes[] = {
@@ -54,11 +55,13 @@ static const struct snd_soc_dapm_route rockchip_dapm_routes[] = {
        {"MIC", NULL, "Headset Mic"},
        {"DMIC1L", NULL, "Int Mic"},
        {"DMIC1R", NULL, "Int Mic"},
+       {"DMic", NULL, "Int Mic"},
 
        /* Output Lines */
        {"Headphones", NULL, "HPL"},
        {"Headphones", NULL, "HPR"},
        {"Speakers", NULL, "Speaker"},
+       {"HDMI", NULL, "TX"},
 };
 
 static const struct snd_kcontrol_new rockchip_controls[] = {
@@ -66,6 +69,7 @@ static const struct snd_kcontrol_new rockchip_controls[] = {
        SOC_DAPM_PIN_SWITCH("Speakers"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
        SOC_DAPM_PIN_SWITCH("Int Mic"),
+       SOC_DAPM_PIN_SWITCH("HDMI"),
 };
 
 static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream,