lkml.org 
[lkml]   [2022]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.18 091/159] ASoC: Intel: sof_ssp_amp: fix no DMIC BE Link on Chromebooks
    Date
    From: Brent Lu <brent.lu@intel.com>

    [ Upstream commit d1c808765deb2bcd35d827402ed4d75d068aae18 ]

    The SOF topology supports 2 BE Links(dmic01 and dmic16k) and each
    link supports up to four DMICs. However, Chromebook does not implement
    ACPI NHLT table so the mach->mach_params.dmic_num is always zero. We
    add a quirk so machine driver knows it's running on a Chromebook and
    need to create BE Links for DMIC.

    Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Signed-off-by: Brent Lu <brent.lu@intel.com>
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20220509170922.54868-3-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_ssp_amp.c | 16 ++++++++++++++--
    1 file changed, 14 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/intel/boards/sof_ssp_amp.c b/sound/soc/intel/boards/sof_ssp_amp.c
    index 88530e9de543..ef70c6f27fe1 100644
    --- a/sound/soc/intel/boards/sof_ssp_amp.c
    +++ b/sound/soc/intel/boards/sof_ssp_amp.c
    @@ -9,6 +9,7 @@

    #include <linux/acpi.h>
    #include <linux/delay.h>
    +#include <linux/dmi.h>
    #include <linux/module.h>
    #include <linux/platform_device.h>
    #include <sound/core.h>
    @@ -78,6 +79,16 @@ struct sof_card_private {
    bool idisp_codec;
    };

    +static const struct dmi_system_id chromebook_platforms[] = {
    + {
    + .ident = "Google Chromebooks",
    + .matches = {
    + DMI_MATCH(DMI_SYS_VENDOR, "Google"),
    + }
    + },
    + {},
    +};
    +
    static const struct snd_soc_dapm_widget sof_ssp_amp_dapm_widgets[] = {
    SND_SOC_DAPM_MIC("SoC DMIC", NULL),
    };
    @@ -371,7 +382,7 @@ static int sof_ssp_amp_probe(struct platform_device *pdev)
    struct snd_soc_dai_link *dai_links;
    struct snd_soc_acpi_mach *mach;
    struct sof_card_private *ctx;
    - int dmic_be_num, hdmi_num = 0;
    + int dmic_be_num = 0, hdmi_num = 0;
    int ret, ssp_codec;

    ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
    @@ -383,7 +394,8 @@ static int sof_ssp_amp_probe(struct platform_device *pdev)

    mach = pdev->dev.platform_data;

    - dmic_be_num = mach->mach_params.dmic_num;
    + if (dmi_check_system(chromebook_platforms) || mach->mach_params.dmic_num > 0)
    + dmic_be_num = 2;

    ssp_codec = sof_ssp_amp_quirk & SOF_AMPLIFIER_SSP_MASK;

    --
    2.35.1
    \
     
     \ /
      Last update: 2022-05-30 15:39    [W:4.223 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site