@@ -263,14 +263,14 @@ struct avs_acpi_boards {
};
#define AVS_MACH_ENTRY(_id, _mach) \
- { .id = (_id), .machs = (_mach), }
+ { .id = PCI_DEVICE_ID_INTEL_HDA_##_id, .machs = (_mach), }
/* supported I2S boards per platform */
static const struct avs_acpi_boards i2s_boards[] = {
- AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */
- AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */
- AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */
- AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */
+ AVS_MACH_ENTRY(SKL_LP, avs_skl_i2s_machines),
+ AVS_MACH_ENTRY(KBL_LP, avs_kbl_i2s_machines),
+ AVS_MACH_ENTRY(APL, avs_apl_i2s_machines),
+ AVS_MACH_ENTRY(GML, avs_gml_i2s_machines),
{},
};
Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY macro, so device id can be provided in short form. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> --- sound/soc/intel/avs/board_selection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)