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

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

ASoC: meson: axg-frddr: expose all 8 outputs 



The FRDDR component, as it, has a maximum of 8 outputs. Depending on
the SoC, these may not all be connected.

Instead of decribing only the connected outputs 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-4-jbrunet@baylibre.com


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

sound/soc/meson/axg-frddr.c

+24 −8
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = { 
};



static const char * const axg_frddr_sel_texts[] = {

	"OUT 0", "OUT 1", "OUT 2", "OUT 3"

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

};



static SOC_ENUM_SINGLE_DECL(axg_frddr_sel_enum, FIFO_CTRL0, CTRL0_SEL_SHIFT,
@@ -120,6 +120,10 @@ static const struct snd_soc_dapm_widget axg_frddr_dapm_widgets[] = { 
	SND_SOC_DAPM_AIF_OUT("OUT 1", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 2", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 3", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 4", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 5", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 6", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 7", NULL, 0, SND_SOC_NOPM, 0, 0),

};



static const struct snd_soc_dapm_route axg_frddr_dapm_routes[] = {
@@ -128,6 +132,10 @@ static const struct snd_soc_dapm_route axg_frddr_dapm_routes[] = { 
	{ "OUT 1", "OUT 1",  "SINK SEL" },

	{ "OUT 2", "OUT 2",  "SINK SEL" },

	{ "OUT 3", "OUT 3",  "SINK SEL" },

	{ "OUT 4", "OUT 4",  "SINK SEL" },

	{ "OUT 5", "OUT 5",  "SINK SEL" },

	{ "OUT 6", "OUT 6",  "SINK SEL" },

	{ "OUT 7", "OUT 7",  "SINK SEL" },

};



static const struct snd_soc_component_driver axg_frddr_component_drv = {
@@ -162,16 +170,12 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = { 
	.pcm_new	= axg_frddr_pcm_new,

};



static const char * const g12a_frddr_sel_texts[] = {

	"OUT 0", "OUT 1", "OUT 2", "OUT 3", "OUT 4",

};



static SOC_ENUM_SINGLE_DECL(g12a_frddr_sel1_enum, FIFO_CTRL0, CTRL0_SEL_SHIFT,

			    g12a_frddr_sel_texts);

			    axg_frddr_sel_texts);

static SOC_ENUM_SINGLE_DECL(g12a_frddr_sel2_enum, FIFO_CTRL0, CTRL0_SEL2_SHIFT,

			    g12a_frddr_sel_texts);

			    axg_frddr_sel_texts);

static SOC_ENUM_SINGLE_DECL(g12a_frddr_sel3_enum, FIFO_CTRL0, CTRL0_SEL3_SHIFT,

			    g12a_frddr_sel_texts);

			    axg_frddr_sel_texts);



static const struct snd_kcontrol_new g12a_frddr_out1_demux =

	SOC_DAPM_ENUM("Output Src 1", g12a_frddr_sel1_enum);
@@ -211,6 +215,9 @@ static const struct snd_soc_dapm_widget g12a_frddr_dapm_widgets[] = { 
	SND_SOC_DAPM_AIF_OUT("OUT 2", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 3", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 4", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 5", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 6", NULL, 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("OUT 7", NULL, 0, SND_SOC_NOPM, 0, 0),

};



static const struct snd_soc_dapm_route g12a_frddr_dapm_routes[] = {
@@ -228,16 +235,25 @@ static const struct snd_soc_dapm_route g12a_frddr_dapm_routes[] = { 
	{ "OUT 2", "OUT 2", "SINK 1 SEL" },

	{ "OUT 3", "OUT 3", "SINK 1 SEL" },

	{ "OUT 4", "OUT 4", "SINK 1 SEL" },

	{ "OUT 5", "OUT 5", "SINK 1 SEL" },

	{ "OUT 6", "OUT 6", "SINK 1 SEL" },

	{ "OUT 7", "OUT 7", "SINK 1 SEL" },

	{ "OUT 0", "OUT 0", "SINK 2 SEL" },

	{ "OUT 1", "OUT 1", "SINK 2 SEL" },

	{ "OUT 2", "OUT 2", "SINK 2 SEL" },

	{ "OUT 3", "OUT 3", "SINK 2 SEL" },

	{ "OUT 4", "OUT 4", "SINK 2 SEL" },

	{ "OUT 5", "OUT 5", "SINK 2 SEL" },

	{ "OUT 6", "OUT 6", "SINK 2 SEL" },

	{ "OUT 7", "OUT 7", "SINK 2 SEL" },

	{ "OUT 0", "OUT 0", "SINK 3 SEL" },

	{ "OUT 1", "OUT 1", "SINK 3 SEL" },

	{ "OUT 2", "OUT 2", "SINK 3 SEL" },

	{ "OUT 3", "OUT 3", "SINK 3 SEL" },

	{ "OUT 4", "OUT 4", "SINK 3 SEL" },

	{ "OUT 5", "OUT 5", "SINK 3 SEL" },

	{ "OUT 6", "OUT 6", "SINK 3 SEL" },

	{ "OUT 7", "OUT 7", "SINK 3 SEL" },

};



static const struct snd_soc_component_driver g12a_frddr_component_drv = {