lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0989/1157] ASoC: Intel: sof_rt5682: Perform quirk check first in card late probe
    Date
    From: Yong Zhi <yong.zhi@intel.com>

    [ Upstream commit 371a3f01fc1862c23fae35cb2c98ffb2eec143f1 ]

    The check of sof_rt5682_quirk should not be skipped unless the HDMI
    handling code exits with error, fix by moving the quirk check to the front.

    Fixes: 94d2d0897474 ("ASoC: Intel: Boards: tgl_max98373: add dai_trigger function")
    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Signed-off-by: Yong Zhi <yong.zhi@intel.com>
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20220725194909.145418-10-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/boards/sof_rt5682.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
    index 4a90a0a5d831..cf4d3f059b40 100644
    --- a/sound/soc/intel/boards/sof_rt5682.c
    +++ b/sound/soc/intel/boards/sof_rt5682.c
    @@ -434,6 +434,15 @@ static int sof_card_late_probe(struct snd_soc_card *card)
    struct sof_hdmi_pcm *pcm;
    int err;

    + if (sof_rt5682_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT) {
    + /* Disable Left and Right Spk pin after boot */
    + snd_soc_dapm_disable_pin(dapm, "Left Spk");
    + snd_soc_dapm_disable_pin(dapm, "Right Spk");
    + err = snd_soc_dapm_sync(dapm);
    + if (err < 0)
    + return err;
    + }
    +
    /* HDMI is not supported by SOF on Baytrail/CherryTrail */
    if (is_legacy_cpu || !ctx->idisp_codec)
    return 0;
    @@ -464,15 +473,6 @@ static int sof_card_late_probe(struct snd_soc_card *card)
    return err;
    }

    - if (sof_rt5682_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT) {
    - /* Disable Left and Right Spk pin after boot */
    - snd_soc_dapm_disable_pin(dapm, "Left Spk");
    - snd_soc_dapm_disable_pin(dapm, "Right Spk");
    - err = snd_soc_dapm_sync(dapm);
    - if (err < 0)
    - return err;
    - }
    -
    return hdac_hdmi_jack_port_init(component, &card->dapm);
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:50    [W:3.404 / U:1.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site