Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f769bdf2 authored by Olaya, Margarita's avatar Olaya, Margarita Committed by Liam Girdwood
Browse files

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: default avatarMargarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent d4686c65

sound/soc/codecs/twl6040.c

+4 −4
Original line number Diff line number Diff line
@@ -1138,19 +1138,19 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { 
			SND_SOC_NOPM, 0, 0, &hsr_mux_controls),



	/* 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,

			pga_event,

			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,

			pga_event,

			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,

			pga_event,

			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,

			pga_event,

			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),