瀏覽代碼

ASoC: twl6040: Convert HF and HS drivers to use DAPM OUT_DRV widget

Make the phoenix HS and HF drivers use the new DAPM driver
widget in order to guarantee power ON/OFF order sequence.

Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Olaya, Margarita 14 年之前
父節點
當前提交
f769bdf2a7
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      sound/soc/codecs/twl6040.c

+ 4 - 4
sound/soc/codecs/twl6040.c

@@ -1138,19 +1138,19 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
 			SND_SOC_NOPM, 0, 0, &hsr_mux_controls),
 			SND_SOC_NOPM, 0, 0, &hsr_mux_controls),
 
 
 	/* Analog playback drivers */
 	/* Analog playback drivers */
-	SND_SOC_DAPM_PGA_E("Handsfree Left Driver",
+	SND_SOC_DAPM_OUT_DRV_E("Handsfree Left Driver",
 			TWL6040_REG_HFLCTL, 4, 0, NULL, 0,
 			TWL6040_REG_HFLCTL, 4, 0, NULL, 0,
 			pga_event,
 			pga_event,
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-	SND_SOC_DAPM_PGA_E("Handsfree Right Driver",
+	SND_SOC_DAPM_OUT_DRV_E("Handsfree Right Driver",
 			TWL6040_REG_HFRCTL, 4, 0, NULL, 0,
 			TWL6040_REG_HFRCTL, 4, 0, NULL, 0,
 			pga_event,
 			pga_event,
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-	SND_SOC_DAPM_PGA_E("Headset Left Driver",
+	SND_SOC_DAPM_OUT_DRV_E("Headset Left Driver",
 			TWL6040_REG_HSLCTL, 2, 0, NULL, 0,
 			TWL6040_REG_HSLCTL, 2, 0, NULL, 0,
 			pga_event,
 			pga_event,
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-	SND_SOC_DAPM_PGA_E("Headset Right Driver",
+	SND_SOC_DAPM_OUT_DRV_E("Headset Right Driver",
 			TWL6040_REG_HSRCTL, 2, 0, NULL, 0,
 			TWL6040_REG_HSRCTL, 2, 0, NULL, 0,
 			pga_event,
 			pga_event,
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),