Merge series "ASoC: mt6359: Fix regulator_dev_lookup() fails for id "LDO_VAUD18"" from Jiaxin Yu <jiaxin.yu@mediatek.com>:
This series fixed "LDO_VAUD18-supply" regulator register fail. We can see the error log "mt6359-sound supply LDO_VAUD18 not found, using dummy regulator" when register the DAPM widget "LDO_VAUD18" Otherwise, the power can not be turned on correctly when recording. Jiaxin Yu (2): ASoC: mediatek: mt6359: Fix regulator_dev_lookup() fails for id "LDO_VAUD18" dt-bindings: mediatek: mt6359: remove unused property for mt6359 Documentation/devicetree/bindings/sound/mt6359.yaml | 9 --------- sound/soc/codecs/mt6359.c | 7 ++++--- 2 files changed, 4 insertions(+), 12 deletions(-) -- 2.18.0
This commit is contained in:
commit
6b114d8b4d
|
@ -17,11 +17,6 @@ description: |
|
|||
Must be a child node of PMIC wrapper.
|
||||
|
||||
properties:
|
||||
LDO_VAUD18-supply:
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
description: |
|
||||
Regulator of LDO VAUD18 at 1.8V.
|
||||
|
||||
mediatek,dmic-mode:
|
||||
$ref: /schemas/types.yaml#/definitions/uint32
|
||||
description: |
|
||||
|
@ -54,15 +49,11 @@ properties:
|
|||
description: |
|
||||
Specifies the type of mic type connected to adc2
|
||||
|
||||
required:
|
||||
- LDO_VAUD18-supply
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
mt6359codec: mt6359codec {
|
||||
LDO_VAUD18-supply = <&mt6359p_vaud18_reg>;
|
||||
mediatek,dmic-mode = <0>;
|
||||
mediatek,mic-type-0 = <2>;
|
||||
};
|
||||
|
|
|
@ -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"},
|
||||
|
|
Loading…
Reference in a new issue