Commit 8d9614b8 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Takashi Iwai
Browse files

ASoC: Intel: avs: Convert to PCI device IDs defines 



Use PCI device IDs from pci_ids.h header and while at it change to using
PCI_DEVICE_DATA() macro, to simplify declarations.

Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230717114511.484999-12-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e6232c80

sound/soc/intel/avs/core.c

+8 −8
Original line number Diff line number Diff line
@@ -745,14 +745,14 @@ static const struct avs_spec apl_desc = { 
};



static const struct pci_device_id avs_ids[] = {

	{ PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */

	{ PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */

	{ PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */

	{ PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */

	{ PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */

	{ PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */

	{ PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */

	{ PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */

	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, avs_ids);