Unverified Commit 20230620 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-5.5' into asoc-linus

parents def9d278 8ce1cbd6

sound/soc/codecs/cs47l15.c

+12 −1
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ SND_SOC_DAPM_OUTPUT("DRC2 Signal Activity"), 
SND_SOC_DAPM_OUTPUT("DSP Trigger Out"),



SND_SOC_DAPM_DEMUX("HPOUT1 Demux", SND_SOC_NOPM, 0, 0, &cs47l15_outdemux),

SND_SOC_DAPM_MUX("HPOUT1 Mono Mux", SND_SOC_NOPM, 0, 0, &cs47l15_outdemux),



SND_SOC_DAPM_PGA("PWM1 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM1_ENA_SHIFT,

		 0, NULL, 0),
@@ -1084,6 +1085,9 @@ static const struct snd_soc_dapm_route cs47l15_dapm_routes[] = { 
	{ "AEC2 Loopback", "HPOUT1R", "OUT1R" },

	{ "HPOUT1 Demux", NULL, "OUT1L" },

	{ "HPOUT1 Demux", NULL, "OUT1R" },



	{ "OUT1R", NULL, "HPOUT1 Mono Mux" },



	{ "HPOUTL", "HPOUT", "HPOUT1 Demux" },

	{ "HPOUTR", "HPOUT", "HPOUT1 Demux" },

	{ "EPOUTP", "EPOUT", "HPOUT1 Demux" },
@@ -1261,6 +1265,11 @@ static irqreturn_t cs47l15_adsp2_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static const struct snd_soc_dapm_route cs47l15_mono_routes[] = {

	{ "HPOUT1 Mono Mux", "HPOUT", "OUT1L" },

	{ "HPOUT1 Mono Mux", "EPOUT", "OUT1L" },

};



static int cs47l15_component_probe(struct snd_soc_component *component)

{

	struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
@@ -1277,7 +1286,9 @@ static int cs47l15_component_probe(struct snd_soc_component *component) 
	if (ret)

		return ret;



	ret = madera_init_outputs(component, CS47L15_MONO_OUTPUTS);

	ret = madera_init_outputs(component, cs47l15_mono_routes,

				  ARRAY_SIZE(cs47l15_mono_routes),

				  CS47L15_MONO_OUTPUTS);

	if (ret)

		return ret;

sound/soc/codecs/cs47l35.c

+11 −1
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ SND_SOC_DAPM_OUTPUT("DRC2 Signal Activity"), 
SND_SOC_DAPM_OUTPUT("DSP Trigger Out"),



SND_SOC_DAPM_DEMUX("HPOUT1 Demux", SND_SOC_NOPM, 0, 0, &cs47l35_outdemux),

SND_SOC_DAPM_MUX("HPOUT1 Mono Mux", SND_SOC_NOPM, 0, 0, &cs47l35_outdemux),



SND_SOC_DAPM_PGA("PWM1 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM1_ENA_SHIFT,

		 0, NULL, 0),
@@ -1309,6 +1310,8 @@ static const struct snd_soc_dapm_route cs47l35_dapm_routes[] = { 
	{ "SPKOUTN", NULL, "OUT4L" },

	{ "SPKOUTP", NULL, "OUT4L" },



	{ "OUT1R", NULL, "HPOUT1 Mono Mux" },



	{ "HPOUTL", "HPOUT", "HPOUT1 Demux" },

	{ "HPOUTR", "HPOUT", "HPOUT1 Demux" },

	{ "EPOUTP", "EPOUT", "HPOUT1 Demux" },
@@ -1552,6 +1555,11 @@ static irqreturn_t cs47l35_adsp2_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static const struct snd_soc_dapm_route cs47l35_mono_routes[] = {

	{ "HPOUT1 Mono Mux", "HPOUT", "OUT1L" },

	{ "HPOUT1 Mono Mux", "EPOUT", "OUT1L" },

};



static int cs47l35_component_probe(struct snd_soc_component *component)

{

	struct cs47l35 *cs47l35 = snd_soc_component_get_drvdata(component);
@@ -1568,7 +1576,9 @@ static int cs47l35_component_probe(struct snd_soc_component *component) 
	if (ret)

		return ret;



	ret = madera_init_outputs(component, CS47L35_MONO_OUTPUTS);

	ret = madera_init_outputs(component, cs47l35_mono_routes,

				  ARRAY_SIZE(cs47l35_mono_routes),

				  CS47L35_MONO_OUTPUTS);

	if (ret)

		return ret;

sound/soc/codecs/cs47l85.c

+8 −1
Original line number Diff line number Diff line
@@ -2005,12 +2005,18 @@ static const struct snd_soc_dapm_route cs47l85_dapm_routes[] = { 
	{ "IN3R", NULL, "IN3R Mode" },



	{ "IN4L", NULL, "DMICCLK4" },

	{ "IN4L", NULL, "DMICDAT4" },

	{ "IN4R", NULL, "DMICCLK4" },

	{ "IN4R", NULL, "DMICDAT4" },



	{ "IN5L", NULL, "DMICCLK5" },

	{ "IN5L", NULL, "DMICDAT5" },

	{ "IN5R", NULL, "DMICCLK5" },

	{ "IN5R", NULL, "DMICDAT5" },



	{ "IN6L", NULL, "DMICCLK6" },

	{ "IN6L", NULL, "DMICDAT6" },

	{ "IN6R", NULL, "DMICCLK6" },

	{ "IN6R", NULL, "DMICDAT6" },



	MADERA_MIXER_ROUTES("OUT1L", "HPOUT1L"),
@@ -2507,7 +2513,8 @@ static int cs47l85_component_probe(struct snd_soc_component *component) 
	if (ret)

		return ret;



	ret = madera_init_outputs(component, CS47L85_MONO_OUTPUTS);

	ret = madera_init_outputs(component, NULL, CS47L85_MONO_OUTPUTS,

				  CS47L85_MONO_OUTPUTS);

	if (ret)

		return ret;

sound/soc/codecs/cs47l90.c

+8 −1
Original line number Diff line number Diff line
@@ -1935,12 +1935,18 @@ static const struct snd_soc_dapm_route cs47l90_dapm_routes[] = { 
	{ "IN2R", NULL, "IN2R Mode" },



	{ "IN3L", NULL, "DMICCLK3" },

	{ "IN3L", NULL, "DMICDAT3" },

	{ "IN3R", NULL, "DMICCLK3" },

	{ "IN3R", NULL, "DMICDAT3" },



	{ "IN4L", NULL, "DMICCLK4" },

	{ "IN4L", NULL, "DMICDAT4" },

	{ "IN4R", NULL, "DMICCLK4" },

	{ "IN4R", NULL, "DMICDAT4" },



	{ "IN5L", NULL, "DMICCLK5" },

	{ "IN5L", NULL, "DMICDAT5" },

	{ "IN5R", NULL, "DMICCLK5" },

	{ "IN5R", NULL, "DMICDAT5" },



	MADERA_MIXER_ROUTES("OUT1L", "HPOUT1L"),
@@ -2418,7 +2424,8 @@ static int cs47l90_component_probe(struct snd_soc_component *component) 
	if (ret)

		return ret;



	ret = madera_init_outputs(component, CS47L90_MONO_OUTPUTS);

	ret = madera_init_outputs(component, NULL, CS47L90_MONO_OUTPUTS,

				  CS47L90_MONO_OUTPUTS);

	if (ret)

		return ret;

sound/soc/codecs/cs47l92.c

+13 −1
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ SND_SOC_DAPM_MUX("IN2L Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[1]), 
SND_SOC_DAPM_MUX("IN2R Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[1]),



SND_SOC_DAPM_DEMUX("OUT3 Demux", SND_SOC_NOPM, 0, 0, &cs47l92_outdemux),

SND_SOC_DAPM_MUX("OUT3 Mono Mux", SND_SOC_NOPM, 0, 0, &cs47l92_outdemux),



SND_SOC_DAPM_OUTPUT("DRC1 Signal Activity"),

SND_SOC_DAPM_OUTPUT("DRC2 Signal Activity"),
@@ -1584,6 +1585,8 @@ static const struct snd_soc_dapm_route cs47l92_dapm_routes[] = { 
	{ "OUT3 Demux", NULL, "OUT3L" },

	{ "OUT3 Demux", NULL, "OUT3R" },



	{ "OUT3R", NULL, "OUT3 Mono Mux" },



	{ "HPOUT3L", "HPOUT3", "OUT3 Demux" },

	{ "HPOUT3R", "HPOUT3", "OUT3 Demux" },

	{ "HPOUT4L", "HPOUT4", "OUT3 Demux" },
@@ -1817,6 +1820,13 @@ static irqreturn_t cs47l92_adsp2_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static const struct snd_soc_dapm_route cs47l92_mono_routes[] = {

	{ "OUT1R", NULL, "OUT1L" },

	{ "OUT2R", NULL, "OUT2L" },

	{ "OUT3 Mono Mux", "HPOUT3", "OUT3L" },

	{ "OUT3 Mono Mux", "HPOUT4", "OUT3L" },

};



static int cs47l92_component_probe(struct snd_soc_component *component)

{

	struct cs47l92 *cs47l92 = snd_soc_component_get_drvdata(component);
@@ -1833,7 +1843,9 @@ static int cs47l92_component_probe(struct snd_soc_component *component) 
	if (ret)

		return ret;



	ret = madera_init_outputs(component, CS47L92_MONO_OUTPUTS);

	ret = madera_init_outputs(component, cs47l92_mono_routes,

				  ARRAY_SIZE(cs47l92_mono_routes),

				  CS47L92_MONO_OUTPUTS);

	if (ret)

		return ret;