mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
0205f3753d
This is a relatively quiet release, there's a lot of driver specific changes and the usual high level of activity in the SOF core but the one big core change was Mormioto-san's work to support more N:M CPU:CODEC mapping cases. Highlights include: - Enhanced support for N:M CPU:CODEC mappings in the core and in audio-graph-card2. - Support for falling back to older SOF IPC versions where firmware for new versions is not available. - Support for notification of control changes generated by SOF firmware with IPC4. - Device tree support for describing parts of the card which can be active over suspend (for very low power playback or wake word use cases). - ACPI parsing support for the ES83xx driver, reducing the number of quirks neede for x86 systems. - Support for more AMD and Intel systems, NXP i.MX8m MICFIL, Qualcomm SM8250, SM8550, SM8650 and X1E80100. - Removal of Freescale MPC8610 support, the SoC is no longer supported by Linux. -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmWbJ5EACgkQJNaLcl1U h9CZTwf/c8CPwoKABZear8jiQpZLUhFLuGQwSShPYVZ7XPzzTMp9BwVmd40DCnUi NeSc22t2UgT0H06nx3QK8sKOhrpQoBQVrIajf2AaxD44TJbsOYGGe4pMh1sXKAMF c0ybp8uRgsjiv2Y++SBXZLexGC11/b8eTFLV1nTK/i2nygGjbfWSJ9s4PpB9V6cA nZrQ/p+x/ZwaBejFUnvE06M7GHtCD6lxrB9Q1EmWA4RxcW7RNUtIN5gr16HlaMiC 3gix4mg40llhBFF9s4eBjRBNKL2paiejPZwcYkAC8w+SkZ/roXaeN55g0avmDWyW AN9o096vaEVWKhZ/jdTHmFVf2PV2Iw== =rbT5 -----END PGP SIGNATURE----- Merge tag 'asoc-v6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Updates for v6.8 This is a relatively quiet release, there's a lot of driver specific changes and the usual high level of activity in the SOF core but the one big core change was Mormioto-san's work to support more N:M CPU:CODEC mapping cases. Highlights include: - Enhanced support for N:M CPU:CODEC mappings in the core and in audio-graph-card2. - Support for falling back to older SOF IPC versions where firmware for new versions is not available. - Support for notification of control changes generated by SOF firmware with IPC4. - Device tree support for describing parts of the card which can be active over suspend (for very low power playback or wake word use cases). - ACPI parsing support for the ES83xx driver, reducing the number of quirks neede for x86 systems. - Support for more AMD and Intel systems, NXP i.MX8m MICFIL, Qualcomm SM8250, SM8550, SM8650 and X1E80100. - Removal of Freescale MPC8610 support, the SoC is no longer supported by Linux.
326 lines
7.4 KiB
C
326 lines
7.4 KiB
C
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
|
|
//
|
|
// This file is provided under a dual BSD/GPLv2 license. When using or
|
|
// redistributing this file, you may do so under either license.
|
|
//
|
|
// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc.
|
|
//
|
|
// Authors: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
|
|
//
|
|
|
|
/* ACP machine configuration module */
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/bits.h>
|
|
#include <linux/dmi.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
|
|
#include "../sof/amd/acp.h"
|
|
#include "mach-config.h"
|
|
|
|
#define ACP_7_0_REV 0x70
|
|
|
|
static int acp_quirk_data;
|
|
|
|
static const struct config_entry config_table[] = {
|
|
{
|
|
.flags = FLAG_AMD_SOF,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "AMD"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Majolica-CZN"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_SOF,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Google"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Valve"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Jupiter"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_SOF,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Valve"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "KLVL-WXXW"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1010"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "KLVL-WXX9"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1010"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "BOM-WXX9"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1010"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HVY-WXX9"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1010"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HVY-WXX9"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1020"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
{
|
|
.flags = FLAG_AMD_LEGACY,
|
|
.device = ACP_PCI_DEV_ID,
|
|
.dmi_table = (const struct dmi_system_id []) {
|
|
{
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HVY-WXX9"),
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1040"),
|
|
},
|
|
},
|
|
{}
|
|
},
|
|
},
|
|
};
|
|
|
|
static int snd_amd_acp_acpi_find_config(struct pci_dev *pci)
|
|
{
|
|
const union acpi_object *obj;
|
|
int acp_flag = FLAG_AMD_LEGACY_ONLY_DMIC;
|
|
|
|
if (!acpi_dev_get_property(ACPI_COMPANION(&pci->dev), "acp-audio-config-flag",
|
|
ACPI_TYPE_INTEGER, &obj))
|
|
acp_flag = obj->integer.value;
|
|
|
|
return acp_flag;
|
|
}
|
|
|
|
int snd_amd_acp_find_config(struct pci_dev *pci)
|
|
{
|
|
const struct config_entry *table = config_table;
|
|
u16 device = pci->device;
|
|
int i;
|
|
|
|
/* Do not enable FLAGS on older platforms with Rev Id zero
|
|
* For platforms which has ACP 7.0 or higher, read the acp
|
|
* config flag from BIOS ACPI table and for older platforms
|
|
* read it from DMI tables.
|
|
*/
|
|
if (!pci->revision)
|
|
return 0;
|
|
else if (pci->revision >= ACP_7_0_REV)
|
|
return snd_amd_acp_acpi_find_config(pci);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(config_table); i++, table++) {
|
|
if (table->device != device)
|
|
continue;
|
|
if (table->dmi_table && !dmi_check_system(table->dmi_table))
|
|
continue;
|
|
acp_quirk_data = table->flags;
|
|
return table->flags;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(snd_amd_acp_find_config);
|
|
|
|
static struct snd_soc_acpi_codecs amp_rt1019 = {
|
|
.num_codecs = 1,
|
|
.codecs = {"10EC1019"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs amp_max = {
|
|
.num_codecs = 1,
|
|
.codecs = {"MX98360A"}
|
|
};
|
|
|
|
static struct snd_soc_acpi_codecs amp_max98388 = {
|
|
.num_codecs = 1,
|
|
.codecs = {"ADS8388"}
|
|
};
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[] = {
|
|
{
|
|
.id = "10EC5682",
|
|
.drv_name = "rt5682-rt1019",
|
|
.pdata = (void *)&acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_rt1019,
|
|
.fw_filename = "sof-rn.ri",
|
|
.sof_tplg_filename = "sof-rn-rt5682-rt1019.tplg",
|
|
},
|
|
{
|
|
.id = "10EC5682",
|
|
.drv_name = "rt5682-max",
|
|
.pdata = (void *)&acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_max,
|
|
.fw_filename = "sof-rn.ri",
|
|
.sof_tplg_filename = "sof-rn-rt5682-max98360.tplg",
|
|
},
|
|
{
|
|
.id = "RTL5682",
|
|
.drv_name = "rt5682s-max",
|
|
.pdata = (void *)&acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_max,
|
|
.fw_filename = "sof-rn.ri",
|
|
.sof_tplg_filename = "sof-rn-rt5682-max98360.tplg",
|
|
},
|
|
{
|
|
.id = "RTL5682",
|
|
.drv_name = "rt5682s-rt1019",
|
|
.pdata = (void *)&acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_rt1019,
|
|
.fw_filename = "sof-rn.ri",
|
|
.sof_tplg_filename = "sof-rn-rt5682-rt1019.tplg",
|
|
},
|
|
{
|
|
.id = "AMDI1019",
|
|
.drv_name = "renoir-dsp",
|
|
.pdata = (void *)&acp_quirk_data,
|
|
.fw_filename = "sof-rn.ri",
|
|
.sof_tplg_filename = "sof-acp.tplg",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL(snd_soc_acpi_amd_sof_machines);
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_vangogh_sof_machines[] = {
|
|
{
|
|
.id = "NVTN2020",
|
|
.drv_name = "nau8821-max",
|
|
.pdata = &acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_max98388,
|
|
.fw_filename = "sof-vangogh.ri",
|
|
.sof_tplg_filename = "sof-vangogh-nau8821-max.tplg",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL(snd_soc_acpi_amd_vangogh_sof_machines);
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[] = {
|
|
{
|
|
.id = "AMDI1019",
|
|
.drv_name = "rmb-dsp",
|
|
.pdata = &acp_quirk_data,
|
|
.fw_filename = "sof-rmb.ri",
|
|
.sof_tplg_filename = "sof-acp-rmb.tplg",
|
|
},
|
|
{
|
|
.id = "10508825",
|
|
.drv_name = "nau8825-max",
|
|
.pdata = &acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_max,
|
|
.fw_filename = "sof-rmb.ri",
|
|
.sof_tplg_filename = "sof-rmb-nau8825-max98360.tplg",
|
|
},
|
|
{
|
|
.id = "RTL5682",
|
|
.drv_name = "rt5682s-hs-rt1019",
|
|
.pdata = &acp_quirk_data,
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_rt1019,
|
|
.fw_filename = "sof-rmb.ri",
|
|
.sof_tplg_filename = "sof-rmb-rt5682s-rt1019.tplg",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL(snd_soc_acpi_amd_rmb_sof_machines);
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_machines[] = {
|
|
{
|
|
.id = "AMDI1019",
|
|
.drv_name = "acp63-dsp",
|
|
.pdata = &acp_quirk_data,
|
|
.fw_filename = "sof-acp_6_3.ri",
|
|
.sof_tplg_filename = "sof-acp_6_3.tplg",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL(snd_soc_acpi_amd_acp63_sof_machines);
|
|
|
|
MODULE_DESCRIPTION("AMD ACP Machine Configuration Module");
|
|
MODULE_LICENSE("Dual BSD/GPL");
|