ASoC: wm5102: Implement routing and power management for ISRCs (91660bd6) · Commits · 戴 / test

sound/soc/codecs/arizona.c

+48 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,30 @@ const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {
		"ASRC1R",
		"ASRC2L",
		"ASRC2R",
		"ISRC1INT1",
		"ISRC1INT2",
		"ISRC1INT3",
		"ISRC1INT4",
		"ISRC1DEC1",
		"ISRC1DEC2",
		"ISRC1DEC3",
		"ISRC1DEC4",
		"ISRC2INT1",
		"ISRC2INT2",
		"ISRC2INT3",
		"ISRC2INT4",
		"ISRC2DEC1",
		"ISRC2DEC2",
		"ISRC2DEC3",
		"ISRC2DEC4",
		"ISRC3INT1",
		"ISRC3INT2",
		"ISRC3INT3",
		"ISRC3INT4",
		"ISRC3DEC1",
		"ISRC3DEC2",
		"ISRC3DEC3",
		"ISRC3DEC4",
		};
		EXPORT_SYMBOL_GPL(arizona_mixer_texts);

		@@ -220,6 +244,30 @@ int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = {
		0x91,
		0x92,
		0x93,
		0xa0, /* ISRC1INT1 */
		0xa1,
		0xa2,
		0xa3,
		0xa4, /* ISRC1DEC1 */
		0xa5,
		0xa6,
		0xa7,
		0xa8, /* ISRC2DEC1 */
		0xa9,
		0xaa,
		0xab,
		0xac, /* ISRC2INT1 */
		0xad,
		0xae,
		0xaf,
		0xb0, /* ISRC3DEC1 */
		0xb1,
		0xb2,
		0xb3,
		0xb4, /* ISRC3INT1 */
		0xb5,
		0xb6,
		0xb7,
		};
		EXPORT_SYMBOL_GPL(arizona_mixer_values);

sound/soc/codecs/arizona.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ struct arizona_priv {
		struct arizona_dai_priv dai[ARIZONA_MAX_DAI];
		};

		#define ARIZONA_NUM_MIXER_INPUTS 75
		#define ARIZONA_NUM_MIXER_INPUTS 99

		extern const unsigned int arizona_mixer_tlv[];
		extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS];

sound/soc/codecs/wm5102.c

+76 −0

Original line number	Diff line number	Diff line
		@@ -876,6 +876,18 @@ ARIZONA_MUX_ENUMS(ASRC1R, ARIZONA_ASRC1RMIX_INPUT_1_SOURCE);
		ARIZONA_MUX_ENUMS(ASRC2L, ARIZONA_ASRC2LMIX_INPUT_1_SOURCE);
		ARIZONA_MUX_ENUMS(ASRC2R, ARIZONA_ASRC2RMIX_INPUT_1_SOURCE);

		ARIZONA_MUX_ENUMS(ISRC1INT1, ARIZONA_ISRC1INT1MIX_INPUT_1_SOURCE);
		ARIZONA_MUX_ENUMS(ISRC1INT2, ARIZONA_ISRC1INT2MIX_INPUT_1_SOURCE);

		ARIZONA_MUX_ENUMS(ISRC1DEC1, ARIZONA_ISRC1DEC1MIX_INPUT_1_SOURCE);
		ARIZONA_MUX_ENUMS(ISRC1DEC2, ARIZONA_ISRC1DEC2MIX_INPUT_1_SOURCE);

		ARIZONA_MUX_ENUMS(ISRC2INT1, ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE);
		ARIZONA_MUX_ENUMS(ISRC2INT2, ARIZONA_ISRC2INT2MIX_INPUT_1_SOURCE);

		ARIZONA_MUX_ENUMS(ISRC2DEC1, ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE);
		ARIZONA_MUX_ENUMS(ISRC2DEC2, ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE);

		ARIZONA_MIXER_ENUMS(DSP1L, ARIZONA_DSP1LMIX_INPUT_1_SOURCE);
		ARIZONA_MIXER_ENUMS(DSP1R, ARIZONA_DSP1RMIX_INPUT_1_SOURCE);

		@@ -999,6 +1011,26 @@ SND_SOC_DAPM_PGA("ASRC2L", ARIZONA_ASRC_ENABLE, ARIZONA_ASRC2L_ENA_SHIFT, 0,
		SND_SOC_DAPM_PGA("ASRC2R", ARIZONA_ASRC_ENABLE, ARIZONA_ASRC2R_ENA_SHIFT, 0,
		NULL, 0),

		SND_SOC_DAPM_PGA("ISRC1INT1", ARIZONA_ISRC_1_CTRL_3,
		ARIZONA_ISRC1_INT0_ENA_SHIFT, 0, NULL, 0),
		SND_SOC_DAPM_PGA("ISRC1INT2", ARIZONA_ISRC_1_CTRL_3,
		ARIZONA_ISRC1_INT1_ENA_SHIFT, 0, NULL, 0),

		SND_SOC_DAPM_PGA("ISRC1DEC1", ARIZONA_ISRC_1_CTRL_3,
		ARIZONA_ISRC1_DEC0_ENA_SHIFT, 0, NULL, 0),
		SND_SOC_DAPM_PGA("ISRC1DEC2", ARIZONA_ISRC_1_CTRL_3,
		ARIZONA_ISRC1_DEC1_ENA_SHIFT, 0, NULL, 0),

		SND_SOC_DAPM_PGA("ISRC2INT1", ARIZONA_ISRC_2_CTRL_3,
		ARIZONA_ISRC2_INT0_ENA_SHIFT, 0, NULL, 0),
		SND_SOC_DAPM_PGA("ISRC2INT2", ARIZONA_ISRC_2_CTRL_3,
		ARIZONA_ISRC2_INT1_ENA_SHIFT, 0, NULL, 0),

		SND_SOC_DAPM_PGA("ISRC2DEC1", ARIZONA_ISRC_2_CTRL_3,
		ARIZONA_ISRC2_DEC0_ENA_SHIFT, 0, NULL, 0),
		SND_SOC_DAPM_PGA("ISRC2DEC2", ARIZONA_ISRC_2_CTRL_3,
		ARIZONA_ISRC2_DEC1_ENA_SHIFT, 0, NULL, 0),

		SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
		ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
		SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,
		@@ -1135,6 +1167,18 @@ ARIZONA_MUX_WIDGETS(ASRC1R, "ASRC1R"),
		ARIZONA_MUX_WIDGETS(ASRC2L, "ASRC2L"),
		ARIZONA_MUX_WIDGETS(ASRC2R, "ASRC2R"),

		ARIZONA_MUX_WIDGETS(ISRC1DEC1, "ISRC1DEC1"),
		ARIZONA_MUX_WIDGETS(ISRC1DEC2, "ISRC1DEC2"),

		ARIZONA_MUX_WIDGETS(ISRC1INT1, "ISRC1INT1"),
		ARIZONA_MUX_WIDGETS(ISRC1INT2, "ISRC1INT2"),

		ARIZONA_MUX_WIDGETS(ISRC2DEC1, "ISRC2DEC1"),
		ARIZONA_MUX_WIDGETS(ISRC2DEC2, "ISRC2DEC2"),

		ARIZONA_MUX_WIDGETS(ISRC2INT1, "ISRC2INT1"),
		ARIZONA_MUX_WIDGETS(ISRC2INT2, "ISRC2INT2"),

		WM_ADSP2("DSP1", 0),

		SND_SOC_DAPM_OUTPUT("HPOUT1L"),
		@@ -1190,6 +1234,14 @@ SND_SOC_DAPM_OUTPUT("SPKDAT1R"),
		{ name, "ASRC1R", "ASRC1R" }, \
		{ name, "ASRC2L", "ASRC2L" }, \
		{ name, "ASRC2R", "ASRC2R" }, \
		{ name, "ISRC1DEC1", "ISRC1DEC1" }, \
		{ name, "ISRC1DEC2", "ISRC1DEC2" }, \
		{ name, "ISRC1INT1", "ISRC1INT1" }, \
		{ name, "ISRC1INT2", "ISRC1INT2" }, \
		{ name, "ISRC2DEC1", "ISRC2DEC1" }, \
		{ name, "ISRC2DEC2", "ISRC2DEC2" }, \
		{ name, "ISRC2INT1", "ISRC2INT1" }, \
		{ name, "ISRC2INT2", "ISRC2INT2" }, \
		{ name, "DSP1.1", "DSP1" }, \
		{ name, "DSP1.2", "DSP1" }, \
		{ name, "DSP1.3", "DSP1" }, \
		@@ -1286,6 +1338,18 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {
		{ "ASRC2L", NULL, "ASRC2L Input" },
		{ "ASRC2R", NULL, "ASRC2R Input" },

		{ "ISRC1DEC1", NULL, "ISRC1DEC1 Input" },
		{ "ISRC1DEC2", NULL, "ISRC1DEC2 Input" },

		{ "ISRC1INT1", NULL, "ISRC1INT1 Input" },
		{ "ISRC1INT2", NULL, "ISRC1INT2 Input" },

		{ "ISRC2DEC1", NULL, "ISRC2DEC1 Input" },
		{ "ISRC2DEC2", NULL, "ISRC2DEC2 Input" },

		{ "ISRC2INT1", NULL, "ISRC2INT1 Input" },
		{ "ISRC2INT2", NULL, "ISRC2INT2 Input" },

		ARIZONA_MIXER_ROUTES("OUT1L", "HPOUT1L"),
		ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"),
		ARIZONA_MIXER_ROUTES("OUT2L", "HPOUT2L"),
		@@ -1333,6 +1397,18 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {
		ARIZONA_MUX_ROUTES("ASRC2L"),
		ARIZONA_MUX_ROUTES("ASRC2R"),

		ARIZONA_MUX_ROUTES("ISRC1INT1"),
		ARIZONA_MUX_ROUTES("ISRC1INT2"),

		ARIZONA_MUX_ROUTES("ISRC1DEC1"),
		ARIZONA_MUX_ROUTES("ISRC1DEC2"),

		ARIZONA_MUX_ROUTES("ISRC2INT1"),
		ARIZONA_MUX_ROUTES("ISRC2INT2"),

		ARIZONA_MUX_ROUTES("ISRC2DEC1"),
		ARIZONA_MUX_ROUTES("ISRC2DEC2"),

		ARIZONA_DSP_ROUTES("DSP1"),

		{ "AEC Loopback", "HPOUT1L", "OUT1L" },

Admin message