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

Commit 35d38893 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm5110: Rename EPOUT to HPOUT3 



The third output on WM5110 is a general purpose headphone output which can
be used to drive an earpice rather than a dedicated earpiece driver.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent aeaeee1a

sound/soc/codecs/wm5110.c

+30 −15
Original line number Diff line number Diff line
@@ -153,6 +153,15 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode), 
SOC_ENUM("LHPF3 Mode", arizona_lhpf3_mode),

SOC_ENUM("LHPF4 Mode", arizona_lhpf4_mode),



ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP2L", ARIZONA_DSP2LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),



ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),
@@ -163,7 +172,8 @@ ARIZONA_MIXER_CONTROLS("HPOUT1L", ARIZONA_OUT1LMIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("HPOUT1R", ARIZONA_OUT1RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("HPOUT2L", ARIZONA_OUT2LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("HPOUT2R", ARIZONA_OUT2RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EPOUT", ARIZONA_OUT3LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("HPOUT3L", ARIZONA_OUT3LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("HPOUT3R", ARIZONA_OUT3RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKOUTL", ARIZONA_OUT4LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKOUTR", ARIZONA_OUT4RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKDAT1L", ARIZONA_OUT5LMIX_INPUT_1_SOURCE),
@@ -175,7 +185,7 @@ SOC_SINGLE("HPOUT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_1L, 
	   ARIZONA_OUT1_OSR_SHIFT, 1, 0),

SOC_SINGLE("OUT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_2L,

	   ARIZONA_OUT2_OSR_SHIFT, 1, 0),

SOC_SINGLE("EPOUT High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,

SOC_SINGLE("OUT3 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,

	   ARIZONA_OUT3_OSR_SHIFT, 1, 0),

SOC_SINGLE("Speaker High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_4L,

	   ARIZONA_OUT4_OSR_SHIFT, 1, 0),
@@ -188,8 +198,8 @@ SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L, 
	     ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("OUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,

	     ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1),

SOC_SINGLE("EPOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,

	   ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("OUT3 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,

	     ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L,

	     ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("SPKDAT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_5L,
@@ -203,8 +213,9 @@ SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L, 
SOC_DOUBLE_R_TLV("OUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,

		 ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_SINGLE_TLV("EPOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,

	       ARIZONA_OUT3L_VOL_SHIFT, 0xbf, 0, digital_tlv),

SOC_DOUBLE_R_TLV("OUT3 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,

		 ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_OUT3L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_DOUBLE_R_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L,

		 ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),
@@ -223,7 +234,8 @@ SOC_DOUBLE_R_RANGE_TLV("OUT2 Volume", ARIZONA_OUTPUT_PATH_CONFIG_2L, 
		       ARIZONA_OUTPUT_PATH_CONFIG_2R,

		       ARIZONA_OUT2L_PGA_VOL_SHIFT,

		       0x34, 0x40, 0, ana_tlv),

SOC_SINGLE_RANGE_TLV("EPOUT Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,

SOC_DOUBLE_R_RANGE_TLV("OUT3 Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,

		       ARIZONA_OUTPUT_PATH_CONFIG_3R,

		       ARIZONA_OUT3L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv),



SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT,
@@ -272,7 +284,8 @@ ARIZONA_MIXER_ENUMS(OUT1L, ARIZONA_OUT1LMIX_INPUT_1_SOURCE); 
ARIZONA_MIXER_ENUMS(OUT1R, ARIZONA_OUT1RMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(OUT2L, ARIZONA_OUT2LMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(OUT2R, ARIZONA_OUT2RMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(OUT3, ARIZONA_OUT3LMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(OUT3L, ARIZONA_OUT3LMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(OUT3R, ARIZONA_OUT3RMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(SPKOUTL, ARIZONA_OUT4LMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(SPKOUTR, ARIZONA_OUT4RMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(SPKDAT1L, ARIZONA_OUT5LMIX_INPUT_1_SOURCE);
@@ -522,7 +535,8 @@ ARIZONA_MIXER_WIDGETS(OUT1L, "HPOUT1L"), 
ARIZONA_MIXER_WIDGETS(OUT1R, "HPOUT1R"),

ARIZONA_MIXER_WIDGETS(OUT2L, "HPOUT2L"),

ARIZONA_MIXER_WIDGETS(OUT2R, "HPOUT2R"),

ARIZONA_MIXER_WIDGETS(OUT3, "EPOUT"),

ARIZONA_MIXER_WIDGETS(OUT3L, "HPOUT3L"),

ARIZONA_MIXER_WIDGETS(OUT3R, "HPOUT3R"),

ARIZONA_MIXER_WIDGETS(SPKOUTL, "SPKOUTL"),

ARIZONA_MIXER_WIDGETS(SPKOUTR, "SPKOUTR"),

ARIZONA_MIXER_WIDGETS(SPKDAT1L, "SPKDAT1L"),
@@ -554,8 +568,8 @@ SND_SOC_DAPM_OUTPUT("HPOUT1L"), 
SND_SOC_DAPM_OUTPUT("HPOUT1R"),

SND_SOC_DAPM_OUTPUT("HPOUT2L"),

SND_SOC_DAPM_OUTPUT("HPOUT2R"),

SND_SOC_DAPM_OUTPUT("EPOUTN"),

SND_SOC_DAPM_OUTPUT("EPOUTP"),

SND_SOC_DAPM_OUTPUT("HPOUT3L"),

SND_SOC_DAPM_OUTPUT("HPOUT3R"),

SND_SOC_DAPM_OUTPUT("SPKOUTLN"),

SND_SOC_DAPM_OUTPUT("SPKOUTLP"),

SND_SOC_DAPM_OUTPUT("SPKOUTRN"),
@@ -701,7 +715,8 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { 
	ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"),

	ARIZONA_MIXER_ROUTES("OUT2L", "HPOUT2L"),

	ARIZONA_MIXER_ROUTES("OUT2R", "HPOUT2R"),

	ARIZONA_MIXER_ROUTES("OUT3L", "EPOUT"),

	ARIZONA_MIXER_ROUTES("OUT3L", "HPOUT3L"),

	ARIZONA_MIXER_ROUTES("OUT3R", "HPOUT3R"),



	ARIZONA_MIXER_ROUTES("OUT4L", "SPKOUTL"),

	ARIZONA_MIXER_ROUTES("OUT4R", "SPKOUTR"),
@@ -754,8 +769,8 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { 
	{ "HPOUT2L", NULL, "OUT2L" },

	{ "HPOUT2R", NULL, "OUT2R" },



	{ "EPOUTN", NULL, "OUT3L" },

	{ "EPOUTP", NULL, "OUT3L" },

	{ "HPOUT3L", NULL, "OUT3L" },

	{ "HPOUT3R", NULL, "OUT3L" },



	{ "SPKOUTLN", NULL, "OUT4L" },

	{ "SPKOUTLP", NULL, "OUT4L" },