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

Commit 57586fb7 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: rt5640: add supplys for dac power 



The DAC1/2 power is for both DACs and related mixer/mux. Add SUPPLY
type widgets to support it.

Signed-off-by: default avatarJack Yu <jack.yu@realtek.com>
Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c467fc0e

sound/soc/codecs/rt5640.c

+24 −15
Original line number Diff line number Diff line
@@ -1217,11 +1217,14 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { 
	SND_SOC_DAPM_MIXER("DIG MIXR", SND_SOC_NOPM, 0, 0,

		rt5640_dig_r_mix, ARRAY_SIZE(rt5640_dig_r_mix)),

	/* DACs */

	SND_SOC_DAPM_DAC("DAC L1", NULL, RT5640_PWR_DIG1,

			RT5640_PWR_DAC_L1_BIT, 0),

	SND_SOC_DAPM_DAC("DAC R1", NULL, RT5640_PWR_DIG1,

			RT5640_PWR_DAC_R1_BIT, 0),



	SND_SOC_DAPM_DAC("DAC L1", NULL, SND_SOC_NOPM,

			0, 0),

	SND_SOC_DAPM_DAC("DAC R1", NULL, SND_SOC_NOPM,

			0, 0),

	SND_SOC_DAPM_SUPPLY("DAC L1 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_L1_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC R1 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_R1_BIT, 0, NULL, 0),

	/* SPK/OUT Mixer */

	SND_SOC_DAPM_MIXER("SPK MIXL", RT5640_PWR_MIXER, RT5640_PWR_SM_L_BIT,

		0, rt5640_spk_l_mix, ARRAY_SIZE(rt5640_spk_l_mix)),
@@ -1298,9 +1301,9 @@ static const struct snd_soc_dapm_widget rt5640_specific_dapm_widgets[] = { 
	SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,

		rt5640_sto_dac_r_mix, ARRAY_SIZE(rt5640_sto_dac_r_mix)),



	SND_SOC_DAPM_DAC("DAC R2", NULL, RT5640_PWR_DIG1, RT5640_PWR_DAC_R2_BIT,

	SND_SOC_DAPM_DAC("DAC R2", NULL, SND_SOC_NOPM, 0,

		0),

	SND_SOC_DAPM_DAC("DAC L2", NULL, RT5640_PWR_DIG1, RT5640_PWR_DAC_L2_BIT,

	SND_SOC_DAPM_DAC("DAC L2", NULL, SND_SOC_NOPM, 0,

		0),



	SND_SOC_DAPM_MIXER("OUT MIXL", RT5640_PWR_MIXER, RT5640_PWR_OM_L_BIT,
@@ -1317,6 +1320,10 @@ static const struct snd_soc_dapm_widget rt5640_specific_dapm_widgets[] = { 
		rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)),

	SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1,

		RT5640_PWR_MA_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC L2 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC R2 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),



	SND_SOC_DAPM_OUTPUT("MONOP"),

	SND_SOC_DAPM_OUTPUT("MONON"),
@@ -1328,11 +1335,6 @@ static const struct snd_soc_dapm_widget rt5639_specific_dapm_widgets[] = { 
	SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,

		rt5639_sto_dac_r_mix, ARRAY_SIZE(rt5639_sto_dac_r_mix)),



	SND_SOC_DAPM_SUPPLY("DAC L2 Filter", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC R2 Filter", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),



	SND_SOC_DAPM_MIXER("OUT MIXL", RT5640_PWR_MIXER, RT5640_PWR_OM_L_BIT,

		0, rt5639_out_l_mix, ARRAY_SIZE(rt5639_out_l_mix)),

	SND_SOC_DAPM_MIXER("OUT MIXR", RT5640_PWR_MIXER, RT5640_PWR_OM_R_BIT,
@@ -1493,8 +1495,10 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { 


	{"DAC MIXL", "Stereo ADC Switch", "Stereo ADC MIXL"},

	{"DAC MIXL", "INF1 Switch", "IF1 DAC L"},

	{"DAC MIXL", NULL, "DAC L1 Power"},

	{"DAC MIXR", "Stereo ADC Switch", "Stereo ADC MIXR"},

	{"DAC MIXR", "INF1 Switch", "IF1 DAC R"},

	{"DAC MIXR", NULL, "DAC R1 Power"},



	{"Stereo DAC MIXL", "DAC L1 Switch", "DAC MIXL"},

	{"Stereo DAC MIXR", "DAC R1 Switch", "DAC MIXR"},
@@ -1507,8 +1511,10 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { 


	{"DAC L1", NULL, "Stereo DAC MIXL"},

	{"DAC L1", NULL, "PLL1", is_sys_clk_from_pll},

	{"DAC L1", NULL, "DAC L1 Power"},

	{"DAC R1", NULL, "Stereo DAC MIXR"},

	{"DAC R1", NULL, "PLL1", is_sys_clk_from_pll},

	{"DAC R1", NULL, "DAC R1 Power"},



	{"SPK MIXL", "REC MIXL Switch", "RECMIXL"},

	{"SPK MIXL", "INL Switch", "INL VOL"},
@@ -1595,8 +1601,9 @@ static const struct snd_soc_dapm_route rt5640_specific_dapm_routes[] = { 


	{"DAC L2 Mux", "IF2", "IF2 DAC L"},

	{"DAC L2 Mux", "Base L/R", "Audio DSP"},



	{"DAC L2 Mux", NULL, "DAC L2 Power"},

	{"DAC R2 Mux", "IF2", "IF2 DAC R"},

	{"DAC R2 Mux", NULL, "DAC R2 Power"},



	{"Stereo DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},

	{"Stereo DAC MIXL", "ANC Switch", "ANC"},
@@ -1614,8 +1621,10 @@ static const struct snd_soc_dapm_route rt5640_specific_dapm_routes[] = { 


	{"DAC L2", NULL, "Mono DAC MIXL"},

	{"DAC L2", NULL, "PLL1", is_sys_clk_from_pll},

	{"DAC L2", NULL, "DAC L2 Power"},

	{"DAC R2", NULL, "Mono DAC MIXR"},

	{"DAC R2", NULL, "PLL1", is_sys_clk_from_pll},

	{"DAC R2", NULL, "DAC R2 Power"},



	{"SPK MIXL", "DAC L2 Switch", "DAC L2"},

	{"SPK MIXR", "DAC R2 Switch", "DAC R2"},
@@ -1656,8 +1665,8 @@ static const struct snd_soc_dapm_route rt5639_specific_dapm_routes[] = { 
	{"DIG MIXL", "DAC L2 Switch", "IF2 DAC L"},

	{"DIG MIXR", "DAC R2 Switch", "IF2 DAC R"},



	{"IF2 DAC L", NULL, "DAC L2 Filter"},

	{"IF2 DAC R", NULL, "DAC R2 Filter"},

	{"IF2 DAC L", NULL, "DAC L2 Power"},

	{"IF2 DAC R", NULL, "DAC R2 Power"},

};



static int get_sdp_info(struct snd_soc_codec *codec, int dai_id)