Skip to content

Commit

Permalink
ASoC: Intel: sof_ssp_amp: fix no DMIC BE Link on Chromebooks
Browse files Browse the repository at this point in the history
[ Upstream commit d1c8087 ]

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>
  • Loading branch information
brentlu authored and gregkh committed Jun 9, 2022
1 parent 492a909 commit 73c3dd7
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions sound/soc/intel/boards/sof_ssp_amp.c
Expand Up @@ -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>
Expand Down Expand Up @@ -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),
};
Expand Down Expand Up @@ -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);
Expand All @@ -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;

Expand Down

0 comments on commit 73c3dd7

Please sign in to comment.