mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-08-29 19:49:10 +00:00

This patch modifies the assignment of machine structure pointers in the
acp_pci_probe function. Previously, the machine pointers were assigned
using the address-of operator (&), which caused incompatibility issues
in type assignments.
Additionally, the declarations of the machine arrays in amd.h have been
updated to reflect that they are indeed arrays (`[]`). The code is
further cleaned up by declaring the codec structures in
amd-acpi-mach.c as static, reflecting their intended usage.
error: symbol 'amp_rt1019' was not declared. Should it be static?
error: symbol 'amp_max' was not declared. Should it be static?
error: symbol 'snd_soc_acpi_amd_acp_machines' was not declared. Should it be static?
error: symbol 'snd_soc_acpi_amd_rmb_acp_machines' was not declared. Should it be static?
error: symbol 'snd_soc_acpi_amd_acp63_acp_machines' was not declared. Should it be static?
error: symbol 'snd_soc_acpi_amd_acp70_acp_machines' was not declared. Should it be static?
Fixes: 9c2c0ef640
("ASoC: amd: acp: Fix snd_soc_acpi_mach id's duplicate symbol error")
Link: https://github.com/thesofproject/linux/issues/5438
Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://patch.msgid.link/20250609121251.639080-1-venkataprasad.potturu@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
94 lines
2.0 KiB
C
94 lines
2.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* amd-acpi-match.c - tables and support for ACP platforms
|
|
* ACPI enumeration.
|
|
*
|
|
* Copyright 2025 Advanced Micro Devices, Inc.
|
|
*/
|
|
|
|
#include <sound/soc-acpi.h>
|
|
|
|
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"}
|
|
};
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = {
|
|
{
|
|
.id = "10EC5682",
|
|
.drv_name = "acp3xalc56821019",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_rt1019,
|
|
},
|
|
{
|
|
.id = "RTL5682",
|
|
.drv_name = "acp3xalc5682sm98360",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_max,
|
|
},
|
|
{
|
|
.id = "RTL5682",
|
|
.drv_name = "acp3xalc5682s1019",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_rt1019,
|
|
},
|
|
{
|
|
.id = "AMDI1019",
|
|
.drv_name = "renoir-acp",
|
|
},
|
|
{
|
|
.id = "ESSX8336",
|
|
.drv_name = "acp3x-es83xx",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL_NS_GPL(snd_soc_acpi_amd_acp_machines, "SND_SOC_ACP_COMMON");
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_acp_machines[] = {
|
|
{
|
|
.id = "10508825",
|
|
.drv_name = "rmb-nau8825-max",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_max,
|
|
},
|
|
{
|
|
.id = "AMDI0007",
|
|
.drv_name = "rembrandt-acp",
|
|
},
|
|
{
|
|
.id = "RTL5682",
|
|
.drv_name = "rmb-rt5682s-rt1019",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &_rt1019,
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL_NS_GPL(snd_soc_acpi_amd_rmb_acp_machines, "SND_SOC_ACP_COMMON");
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_acp_machines[] = {
|
|
{
|
|
.id = "AMDI0052",
|
|
.drv_name = "acp63-acp",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL_NS_GPL(snd_soc_acpi_amd_acp63_acp_machines, "SND_SOC_ACP_COMMON");
|
|
|
|
struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_acp_machines[] = {
|
|
{
|
|
.id = "AMDI0029",
|
|
.drv_name = "acp70-acp",
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL_NS_GPL(snd_soc_acpi_amd_acp70_acp_machines, "SND_SOC_ACP_COMMON");
|
|
|
|
MODULE_DESCRIPTION("AMD ACP tables and support for ACPI enumeration");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Venkataprasad.potturu@amd.com");
|