6df58421da
[ Upstream commit f4eeaed04e861b95f1f2c911263f2fcaa959c078 ]
Sparse warnings triggered truncating the IDs of some platform device
tables. Unfortunately some of the IDs in the match tables were missed
which breaks audio. The KBL change has been verified to fix audio, the
CML change was not tested as it was found through grepping the broken
changes and found to match the same situation in anticipation that it
should also be fixed.
Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Tested-by: Matt Davis <mattedavis@google.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210809213544.1682444-1-cujomalainey@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
134 lines
3.1 KiB
C
134 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* soc-acpi-intel-kbl-match.c - tables and support for KBL ACPI enumeration.
|
|
*
|
|
* Copyright (c) 2018, Intel Corporation.
|
|
*
|
|
*/
|
|
|
|
#include <sound/soc-acpi.h>
|
|
#include <sound/soc-acpi-intel-match.h>
|
|
#include "../skylake/skl.h"
|
|
|
|
static struct skl_machine_pdata skl_dmic_data;
|
|
|
|
static struct snd_soc_acpi_codecs kbl_codecs = {
|
|
.num_codecs = 1,
|
|
.codecs = {"10508825"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs kbl_poppy_codecs = {
|
|
.num_codecs = 1,
|
|
.codecs = {"10EC5663"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs kbl_5663_5514_codecs = {
|
|
.num_codecs = 2,
|
|
.codecs = {"10EC5663", "10EC5514"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs kbl_7219_98357_codecs = {
|
|
.num_codecs = 1,
|
|
.codecs = {"MX98357A"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs kbl_7219_98927_codecs = {
|
|
.num_codecs = 1,
|
|
.codecs = {"MX98927"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs kbl_7219_98373_codecs = {
|
|
.num_codecs = 1,
|
|
.codecs = {"MX98373"}
|
|
};
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
|
|
{
|
|
.id = "INT343A",
|
|
.drv_name = "kbl_alc286s_i2s",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
},
|
|
{
|
|
.id = "INT343B",
|
|
.drv_name = "kbl_n88l25_s4567",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_codecs,
|
|
.pdata = &skl_dmic_data,
|
|
},
|
|
{
|
|
.id = "MX98357A",
|
|
.drv_name = "kbl_n88l25_m98357a",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_codecs,
|
|
.pdata = &skl_dmic_data,
|
|
},
|
|
{
|
|
.id = "MX98927",
|
|
.drv_name = "kbl_r5514_5663_max",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_5663_5514_codecs,
|
|
.pdata = &skl_dmic_data,
|
|
},
|
|
{
|
|
.id = "MX98927",
|
|
.drv_name = "kbl_rt5663_m98927",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_poppy_codecs,
|
|
.pdata = &skl_dmic_data,
|
|
},
|
|
{
|
|
.id = "10EC5663",
|
|
.drv_name = "kbl_rt5663",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
},
|
|
{
|
|
.id = "DLGS7219",
|
|
.drv_name = "kbl_da7219_mx98357a",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_7219_98357_codecs,
|
|
.pdata = &skl_dmic_data,
|
|
},
|
|
{
|
|
.id = "DLGS7219",
|
|
.drv_name = "kbl_da7219_max98927",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_7219_98927_codecs,
|
|
.pdata = &skl_dmic_data
|
|
},
|
|
{
|
|
.id = "10EC5660",
|
|
.drv_name = "kbl_rt5660",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
},
|
|
{
|
|
.id = "10EC3277",
|
|
.drv_name = "kbl_rt5660",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
},
|
|
{
|
|
.id = "DLGS7219",
|
|
.drv_name = "kbl_da7219_mx98373",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_7219_98373_codecs,
|
|
.pdata = &skl_dmic_data
|
|
},
|
|
{
|
|
.id = "MX98373",
|
|
.drv_name = "kbl_max98373",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.pdata = &skl_dmic_data
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_kbl_machines);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("Intel Common ACPI Match module");
|