Unverified Commit 104ce27b authored by Trevor Wu's avatar Trevor Wu Committed by Mark Brown
Browse files

ASoC: mediatek: mt6359: update route for lineout mux 



Originally, lineout playback source can only be DAC_3RD. Some SoC
masters only support stereo MTKAIF outputs, so lineout path can't be
used in such case.

MTKAIF connections are as follows.
MOSI0 -> DAC_L
MOSI1 -> DAC_R
MOSI2 -> DAC_3rd

In the patch, lineout playback source can be chosen between DAC_L and
DAC_3rd, so sound can be outputted via lineout even though SoC only
supports stereo MTKAIF outputs.

Signed-off-by: default avatarTrevor Wu <trevor.wu@mediatek.com>
Link: https://lore.kernel.org/r/20230508071532.21665-5-trevor.wu@mediatek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 24f398e7

sound/soc/codecs/mt6359.c

+35 −9
Original line number Diff line number Diff line
@@ -1159,9 +1159,10 @@ static int mt_lo_event(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);

	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);

	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);



	dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n",

		__func__, event, dapm_kcontrol_get_value(w->kcontrols[0]));

		__func__, event, mux);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -1199,14 +1200,29 @@ static int mt_lo_event(struct snd_soc_dapm_widget *w, 
		/* Enable AUD_CLK */

		mt6359_set_decoder_clk(priv, true);



		/* Switch LOL MUX to audio DAC */

		if (mux == LO_MUX_L_DAC) {

			if (priv->dev_counter[DEVICE_HP] > 0) {

				dev_info(priv->dev, "%s(), can not enable DAC, hp count %d\n",

					 __func__, priv->dev_counter[DEVICE_HP]);

				break;

			}

			/* Enable DACL and switch HP MUX to open*/

			regmap_write(priv->regmap, MT6359_AUDDEC_ANA_CON0, 0x3009);

			/* Disable low-noise mode of DAC */

			regmap_write(priv->regmap, MT6359_AUDDEC_ANA_CON9, 0xf200);

			usleep_range(100, 120);

			/* Switch LOL MUX to DACL */

			regmap_write(priv->regmap, MT6359_AUDDEC_ANA_CON7, 0x0117);

		} else if (mux == LO_MUX_3RD_DAC) {

			/* Enable Audio DAC (3rd DAC) */

			regmap_write(priv->regmap, MT6359_AUDDEC_ANA_CON7, 0x3113);

			/* Enable low-noise mode of DAC */

			if (priv->dev_counter[DEVICE_HP] == 0)

			regmap_write(priv->regmap,

				     MT6359_AUDDEC_ANA_CON9, 0x0001);

				regmap_write(priv->regmap, MT6359_AUDDEC_ANA_CON9, 0x0001);

			/* Switch LOL MUX to audio 3rd DAC */

			regmap_write(priv->regmap, MT6359_AUDDEC_ANA_CON7, 0x311b);

		}

		break;

	case SND_SOC_DAPM_PRE_PMD:

		/* Switch LOL MUX to open */
@@ -1218,6 +1234,15 @@ static int mt_lo_event(struct snd_soc_dapm_widget *w, 
		regmap_update_bits(priv->regmap, MT6359_AUDDEC_ANA_CON0,

				   0x000f, 0x0000);



		if (mux == LO_MUX_L_DAC) {

			/* Disable HP driver core circuits */

			regmap_update_bits(priv->regmap, MT6359_AUDDEC_ANA_CON0,

					   0x3 << 4, 0x0);

			/* Disable HP driver bias circuits */

			regmap_update_bits(priv->regmap, MT6359_AUDDEC_ANA_CON0,

					   0x3 << 6, 0x0);

		}



		/* Disable AUD_CLK */

		mt6359_set_decoder_clk(priv, false);
@@ -2590,6 +2615,7 @@ static const struct snd_soc_dapm_route mt6359_dapm_routes[] = { 


	/* Lineout Path */

	{"LOL Mux", "Playback", "DAC_3RD"},

	{"LOL Mux", "Playback_L_DAC", "DACL"},

	{"LINEOUT L", NULL, "LOL Mux"},



	/* Headphone Path */