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

Commit d88429a6 authored by Olaya, Margarita's avatar Olaya, Margarita Committed by Mark Brown
Browse files

ASoC: dapm: Add output driver widget 



In some cases it was not possible to follow the appropiate power
ON/OFF sequence like in cases where the PGA needs to be enabled
before the driver and disabled before the PGA for pop reduction.

Add a widget to support output driver (speaker, haptic, vibra, etc)
drivers where power ON/OFF ordering is important.

Signed-off-by: default avatarMargarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5a7743ed

include/sound/soc-dapm.h

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ 
	 wcontrols, wncontrols) \

{	.id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}

#define SND_SOC_DAPM_OUT_DRV(wname, wreg, wshift, winvert,\

	 wcontrols, wncontrols) \

{	.id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}

#define SND_SOC_DAPM_MIXER(wname, wreg, wshift, winvert, \

	 wcontrols, wncontrols)\

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
@@ -115,6 +119,11 @@ 
{	.id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_OUT_DRV_E(wname, wreg, wshift, winvert, wcontrols, \

	wncontrols, wevent, wflags) \

{	.id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_MIXER_E(wname, wreg, wshift, winvert, wcontrols, \

	wncontrols, wevent, wflags) \

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
@@ -368,6 +377,7 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_mixer,			/* mixes several analog signals together */

	snd_soc_dapm_mixer_named_ctl,		/* mixer with named controls */

	snd_soc_dapm_pga,			/* programmable gain/attenuation (volume) */

	snd_soc_dapm_out_drv,			/* output driver */

	snd_soc_dapm_adc,			/* analog to digital converter */

	snd_soc_dapm_dac,			/* digital to analog converter */

	snd_soc_dapm_micbias,		/* microphone bias (power) */

sound/soc/soc-dapm.c

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static int dapm_up_seq[] = { 
	[snd_soc_dapm_mixer_named_ctl] = 7,

	[snd_soc_dapm_pga] = 8,

	[snd_soc_dapm_adc] = 9,

	[snd_soc_dapm_out_drv] = 10,

	[snd_soc_dapm_hp] = 10,

	[snd_soc_dapm_spk] = 10,

	[snd_soc_dapm_post] = 11,
@@ -72,6 +73,7 @@ static int dapm_down_seq[] = { 
	[snd_soc_dapm_adc] = 1,

	[snd_soc_dapm_hp] = 2,

	[snd_soc_dapm_spk] = 2,

	[snd_soc_dapm_out_drv] = 2,

	[snd_soc_dapm_pga] = 4,

	[snd_soc_dapm_mixer_named_ctl] = 5,

	[snd_soc_dapm_mixer] = 5,
@@ -235,6 +237,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, 
	break;

	/* does not effect routing - always connected */

	case snd_soc_dapm_pga:

	case snd_soc_dapm_out_drv:

	case snd_soc_dapm_output:

	case snd_soc_dapm_adc:

	case snd_soc_dapm_input:
@@ -1250,6 +1253,7 @@ static ssize_t dapm_widget_show(struct device *dev, 
		case snd_soc_dapm_dac:

		case snd_soc_dapm_adc:

		case snd_soc_dapm_pga:

		case snd_soc_dapm_out_drv:

		case snd_soc_dapm_mixer:

		case snd_soc_dapm_mixer_named_ctl:

		case snd_soc_dapm_supply:
@@ -1428,6 +1432,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, 
	case snd_soc_dapm_adc:

	case snd_soc_dapm_dac:

	case snd_soc_dapm_pga:

	case snd_soc_dapm_out_drv:

	case snd_soc_dapm_input:

	case snd_soc_dapm_output:

	case snd_soc_dapm_micbias:
@@ -1545,6 +1550,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) 
			w->power_check = dapm_dac_check_power;

			break;

		case snd_soc_dapm_pga:

		case snd_soc_dapm_out_drv:

			w->power_check = dapm_generic_check_power;

			dapm_new_pga(dapm, w);

			break;