Unverified Commit cde9f12e authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: meson: tdmin: expose all 16 inputs 



The TDMIN component, as it, has a maximum of 16 input. Depending on
the SoC, these may not all be connected.

Instead of decribing only the connected inputs of each SoC, describe
them all and let ASoC routing do the rest.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20190905120120.31752-6-jbrunet@baylibre.com


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

sound/soc/meson/axg-tdmin.c

+34 −13
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ static const struct regmap_config axg_tdmin_regmap_cfg = { 
};



static const char * const axg_tdmin_sel_texts[] = {

	"IN 0", "IN 1", "IN 2", "IN 3", "IN 4", "IN 5",

	"IN 0", "IN 1", "IN 2",  "IN 3",  "IN 4",  "IN 5",  "IN 6",  "IN 7",

	"IN 8", "IN 9", "IN 10", "IN 11", "IN 12", "IN 13", "IN 14", "IN 15",

};



/* Change to special mux control to reset dapm */
@@ -170,6 +171,16 @@ static const struct snd_soc_dapm_widget axg_tdmin_dapm_widgets[] = { 
	SND_SOC_DAPM_AIF_IN("IN 3",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 4",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 5",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 6",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 7",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 8",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 9",  NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 10", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 11", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 12", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 13", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 14", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("IN 15", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_MUX("SRC SEL", SND_SOC_NOPM, 0, 0, &axg_tdmin_in_mux),

	SND_SOC_DAPM_PGA_E("DEC", SND_SOC_NOPM, 0, 0, NULL, 0,

			   axg_tdm_formatter_event,
@@ -184,6 +195,16 @@ static const struct snd_soc_dapm_route axg_tdmin_dapm_routes[] = { 
	{ "SRC SEL", "IN 3",  "IN 3" },

	{ "SRC SEL", "IN 4",  "IN 4" },

	{ "SRC SEL", "IN 5",  "IN 5" },

	{ "SRC SEL", "IN 6",  "IN 6" },

	{ "SRC SEL", "IN 7",  "IN 7" },

	{ "SRC SEL", "IN 8",  "IN 8" },

	{ "SRC SEL", "IN 9",  "IN 9" },

	{ "SRC SEL", "IN 10", "IN 10" },

	{ "SRC SEL", "IN 11", "IN 11" },

	{ "SRC SEL", "IN 12", "IN 12" },

	{ "SRC SEL", "IN 13", "IN 13" },

	{ "SRC SEL", "IN 14", "IN 14" },

	{ "SRC SEL", "IN 15", "IN 15" },

	{ "DEC", NULL, "SRC SEL" },

	{ "OUT", NULL, "DEC" },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE