Merge tag 'linux-watchdog-5.17-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-microblaze.git] / sound / soc / codecs / msm8916-wcd-analog.c

diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
index 3ddd822..485cda4 100644 (file)
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -822,8 +822,8 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
        {"EAR PA", NULL, "EAR CP"},
 
        /* Headset (RX MIX1 and RX MIX2) */
-       {"HEADPHONE", NULL, "HPHL PA"},
-       {"HEADPHONE", NULL, "HPHR PA"},
+       {"HPH_L", NULL, "HPHL PA"},
+       {"HPH_R", NULL, "HPHR PA"},
 
        {"HPHL DAC", NULL, "EAR_HPHL_CLK"},
        {"HPHR DAC", NULL, "EAR_HPHR_CLK"},
@@ -870,7 +870,8 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
        SND_SOC_DAPM_INPUT("AMIC3"),
        SND_SOC_DAPM_INPUT("AMIC2"),
        SND_SOC_DAPM_OUTPUT("EAR"),
-       SND_SOC_DAPM_OUTPUT("HEADPHONE"),
+       SND_SOC_DAPM_OUTPUT("HPH_L"),
+       SND_SOC_DAPM_OUTPUT("HPH_R"),
 
        /* RX stuff */
        SND_SOC_DAPM_SUPPLY("INT_LDO_H", SND_SOC_NOPM, 1, 0, NULL, 0),