Unverified Commit 9546c76c authored by Jiaxin Yu's avatar Jiaxin Yu Committed by Mark Brown
Browse files

ASoC: mediatek: mt6359: Fix regulator_dev_lookup() fails for id "LDO_VAUD18" 



Mt6359 platform device is instantiated by mfd_add_devices(). In the
case, dev->of_node is NULL so that always fails to get the regulator_dev.

Use regualator-name "vaud18" that in dts node instead of
"LDO_VAUD19-supply". So that we can get regulator_dev through
regulator_lookup_by_name() directly.

Fixes: 64a70744 ("ASoC: Fix vaud18 power leakage of mt6359")
Signed-off-by: default avatarJiaxin Yu <jiaxin.yu@mediatek.com>
Link: https://lore.kernel.org/r/1605841573-1442-2-git-send-email-jiaxin.yu@mediatek.com


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

sound/soc/codecs/mt6359.c

+4 −3
Original line number Diff line number Diff line
@@ -1943,7 +1943,6 @@ static const struct snd_soc_dapm_widget mt6359_dapm_widgets[] = { 
	SND_SOC_DAPM_SUPPLY_S("CLK_BUF", SUPPLY_SEQ_CLK_BUF,

			      MT6359_DCXO_CW12,

			      RG_XO_AUDIO_EN_M_SFT, 0, NULL, 0),

	SND_SOC_DAPM_REGULATOR_SUPPLY("LDO_VAUD18", 0, 0),

	SND_SOC_DAPM_SUPPLY_S("AUDGLB", SUPPLY_SEQ_AUD_GLB,

			      MT6359_AUDDEC_ANA_CON13,

			      RG_AUDGLB_PWRDN_VA32_SFT, 1, NULL, 0),
@@ -1963,6 +1962,8 @@ static const struct snd_soc_dapm_widget mt6359_dapm_widgets[] = { 
	SND_SOC_DAPM_SUPPLY_S("AUDIF_CK", SUPPLY_SEQ_TOP_CK,

			      MT6359_AUD_TOP_CKPDN_CON0,

			      RG_AUDIF_CK_PDN_SFT, 1, NULL, 0),

	SND_SOC_DAPM_REGULATOR_SUPPLY("vaud18", 0, 0),



	/* Digital Clock */

	SND_SOC_DAPM_SUPPLY_S("AUDIO_TOP_AFE_CTL", SUPPLY_SEQ_AUD_TOP_LAST,

			      MT6359_AUDIO_TOP_CON0,
@@ -2312,7 +2313,7 @@ static int mt_dcc_clk_connect(struct snd_soc_dapm_widget *source, 
static const struct snd_soc_dapm_route mt6359_dapm_routes[] = {

	/* Capture */

	{"AIFTX_Supply", NULL, "CLK_BUF"},

	{"AIFTX_Supply", NULL, "LDO_VAUD18"},

	{"AIFTX_Supply", NULL, "vaud18"},

	{"AIFTX_Supply", NULL, "AUDGLB"},

	{"AIFTX_Supply", NULL, "CLKSQ Audio"},

	{"AIFTX_Supply", NULL, "AUD_CK"},
@@ -2440,7 +2441,7 @@ static const struct snd_soc_dapm_route mt6359_dapm_routes[] = { 


	/* DL Supply */

	{"DL Power Supply", NULL, "CLK_BUF"},

	{"DL Power Supply", NULL, "LDO_VAUD18"},

	{"DL Power Supply", NULL, "vaud18"},

	{"DL Power Supply", NULL, "AUDGLB"},

	{"DL Power Supply", NULL, "CLKSQ Audio"},

	{"DL Power Supply", NULL, "AUDNCP_CK"},

CRA Git | Maintained and supported by SUSTech CRA and CCSE