PCI IDs for Intel HDA are duplicated across quite a few drivers, due to
various configurations and historical reasons. Currently almost all uses
of HDA PCI IDs have corresponding comment telling which platform it is.
Additionally there are some inconsistencies between drivers about which
ID corresponds to which device.
Simplify things, by adding PCI IDs to global header and make use of them
in drivers. This allows for removal of comments by having IDs themselves
being self explanatory. Additionally it allows for removal of existing
inconsistencies by having one source of truth.
Changes from RFC:
- Sort Intel PCI IDs before adding new ones
- Fix ordering of new PCI IDs (Andy)
- Define all used Intel IDs (Andy)
- Add macros for controller type detection (Andy/Bjorn)
- Add set of patches changing to use above macro (Andy/Bjorn)
- Use PCI_DEVICE_DATA for Intel IDs in sound/pci/hda/hda_intel.c (Andy)
- Commit message wording (Andy)
- Remove unnecessary tabs (Andy)
Amadeusz Sławiński (13):
PCI: Sort Intel PCI IDs by number
PCI: Add Intel Audio DSP devices to pci_ids.h
ALSA: hda: Add controller matching macros
ALSA: hda: Use global PCI match macro
ALSA: hda/i915: Use global PCI match macro
ASoC: Intel: Skylake: Use global PCI match macro
ALSA: intel-dsp-config: Convert to PCI device IDs defines
ALSA: hda: Convert to PCI device IDs defines
ASoC: Intel: avs: Convert to PCI device IDs defines
ASoC: Intel: avs: Convert to PCI device IDs defines
ASoC: Intel: Skylake: Convert to PCI device IDs defines
ASoC: SOF: Intel: Convert to PCI device IDs defines
ASoC: Intel: sst: Convert to PCI device IDs defines
include/linux/pci_ids.h | 104 +++++--
include/sound/hda_codec.h | 3 -
include/sound/hdaudio.h | 27 ++
sound/hda/hdac_i915.c | 7 +-
sound/hda/intel-dsp-config.c | 119 ++++----
sound/pci/hda/hda_intel.c | 373 ++++++++++---------------
sound/soc/intel/atom/sst/sst.c | 3 +-
sound/soc/intel/atom/sst/sst.h | 1 -
sound/soc/intel/atom/sst/sst_pci.c | 4 +-
sound/soc/intel/avs/board_selection.c | 10 +-
sound/soc/intel/avs/core.c | 16 +-
sound/soc/intel/skylake/skl-messages.c | 16 +-
sound/soc/intel/skylake/skl-pcm.c | 3 +-
sound/soc/intel/skylake/skl.c | 36 +--
sound/soc/sof/intel/pci-apl.c | 9 +-
sound/soc/sof/intel/pci-cnl.c | 15 +-
sound/soc/sof/intel/pci-icl.c | 12 +-
sound/soc/sof/intel/pci-mtl.c | 3 +-
sound/soc/sof/intel/pci-skl.c | 6 +-
sound/soc/sof/intel/pci-tgl.c | 45 +--
sound/soc/sof/intel/pci-tng.c | 3 +-
21 files changed, 384 insertions(+), 431 deletions(-)
--
2.34.1
Use PCI device IDs from pci_ids.h header and while at it to simplify
declarations change to using PCI_DEVICE_DATA() macro for Intel IDs and
PCI_VDEVICE() for all other that have defined vendor.
Acked-by: Mark Brown <[email protected]>
Signed-off-by: Amadeusz Sławiński <[email protected]>
---
sound/pci/hda/hda_intel.c | 353 +++++++++++++++-----------------------
1 file changed, 141 insertions(+), 212 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 143efa54b9bf..4a162f27b46e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2416,333 +2416,262 @@ static void azx_shutdown(struct pci_dev *pci)
/* PCI IDs */
static const struct pci_device_id azx_ids[] = {
/* CPT */
- { PCI_DEVICE(0x8086, 0x1c20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+ { PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
/* PBG */
- { PCI_DEVICE(0x8086, 0x1d20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+ { PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
/* Panther Point */
- { PCI_DEVICE(0x8086, 0x1e20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+ { PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
/* Lynx Point */
- { PCI_DEVICE(0x8086, 0x8c20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+ { PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
/* 9 Series */
- { PCI_DEVICE(0x8086, 0x8ca0),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+ { PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
/* Wellsburg */
- { PCI_DEVICE(0x8086, 0x8d20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
- { PCI_DEVICE(0x8086, 0x8d21),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+ { PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
+ { PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
/* Lewisburg */
- { PCI_DEVICE(0x8086, 0xa1f0),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
- { PCI_DEVICE(0x8086, 0xa270),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+ { PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
/* Lynx Point-LP */
- { PCI_DEVICE(0x8086, 0x9c20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+ { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
/* Lynx Point-LP */
- { PCI_DEVICE(0x8086, 0x9c21),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+ { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
/* Wildcat Point-LP */
- { PCI_DEVICE(0x8086, 0x9ca0),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
- /* Sunrise Point */
- { PCI_DEVICE(0x8086, 0xa170),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
- /* Sunrise Point-LP */
- { PCI_DEVICE(0x8086, 0x9d70),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ { PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
+ /* Skylake (Sunrise Point) */
+ { PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ /* Skylake-LP (Sunrise Point-LP) */
+ { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Kabylake */
- { PCI_DEVICE(0x8086, 0xa171),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ { PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Kabylake-LP */
- { PCI_DEVICE(0x8086, 0x9d71),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Kabylake-H */
- { PCI_DEVICE(0x8086, 0xa2f0),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Coffelake */
- { PCI_DEVICE(0x8086, 0xa348),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Cannonlake */
- { PCI_DEVICE(0x8086, 0x9dc8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* CometLake-LP */
- { PCI_DEVICE(0x8086, 0x02C8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* CometLake-H */
- { PCI_DEVICE(0x8086, 0x06C8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0xf1c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* CometLake-S */
- { PCI_DEVICE(0x8086, 0xa3f0),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* CometLake-R */
- { PCI_DEVICE(0x8086, 0xf0c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Icelake */
- { PCI_DEVICE(0x8086, 0x34c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Icelake-H */
- { PCI_DEVICE(0x8086, 0x3dc8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Jasperlake */
- { PCI_DEVICE(0x8086, 0x38c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x4dc8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Tigerlake */
- { PCI_DEVICE(0x8086, 0xa0c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Tigerlake-H */
- { PCI_DEVICE(0x8086, 0x43c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* DG1 */
- { PCI_DEVICE(0x8086, 0x490d),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* DG2 */
- { PCI_DEVICE(0x8086, 0x4f90),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x4f91),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x4f92),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Alderlake-S */
- { PCI_DEVICE(0x8086, 0x7ad0),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Alderlake-P */
- { PCI_DEVICE(0x8086, 0x51c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x51c9),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x51cd),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Alderlake-M */
- { PCI_DEVICE(0x8086, 0x51cc),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Alderlake-N */
- { PCI_DEVICE(0x8086, 0x54c8),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Elkhart Lake */
- { PCI_DEVICE(0x8086, 0x4b55),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x4b58),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Raptor Lake */
- { PCI_DEVICE(0x8086, 0x7a50),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x51ca),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x51cb),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x51ce),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- { PCI_DEVICE(0x8086, 0x51cf),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- /* Meteorlake-P */
- { PCI_DEVICE(0x8086, 0x7e28),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ { PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ { PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
/* Lunarlake-P */
- { PCI_DEVICE(0x8086, 0xa828),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
- /* Broxton-P(Apollolake) */
- { PCI_DEVICE(0x8086, 0x5a98),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+ { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+ /* Apollolake (Broxton-P) */
+ { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
/* Broxton-T */
- { PCI_DEVICE(0x8086, 0x1a98),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+ { PCI_DEVICE_DATA(INTEL, HDA_APL_T, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
/* Gemini-Lake */
- { PCI_DEVICE(0x8086, 0x3198),
- .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+ { PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
/* Haswell */
- { PCI_DEVICE(0x8086, 0x0a0c),
- .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
- { PCI_DEVICE(0x8086, 0x0c0c),
- .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
- { PCI_DEVICE(0x8086, 0x0d0c),
- .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
+ { PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
+ { PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
+ { PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
/* Broadwell */
- { PCI_DEVICE(0x8086, 0x160c),
- .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
+ { PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
/* 5 Series/3400 */
- { PCI_DEVICE(0x8086, 0x3b56),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
- { PCI_DEVICE(0x8086, 0x3b57),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
+ { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
+ { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
/* Poulsbo */
- { PCI_DEVICE(0x8086, 0x811b),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
- AZX_DCAPS_POSFIX_LPIB },
+ { PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
+ AZX_DCAPS_POSFIX_LPIB) },
/* Oaktrail */
- { PCI_DEVICE(0x8086, 0x080a),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
+ { PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
/* BayTrail */
- { PCI_DEVICE(0x8086, 0x0f04),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
+ { PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
/* Braswell */
- { PCI_DEVICE(0x8086, 0x2284),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
+ { PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
/* ICH6 */
- { PCI_DEVICE(0x8086, 0x2668),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ICH7 */
- { PCI_DEVICE(0x8086, 0x27d8),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ESB2 */
- { PCI_DEVICE(0x8086, 0x269a),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ICH8 */
- { PCI_DEVICE(0x8086, 0x284b),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ICH9 */
- { PCI_DEVICE(0x8086, 0x293e),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ICH9 */
- { PCI_DEVICE(0x8086, 0x293f),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ICH10 */
- { PCI_DEVICE(0x8086, 0x3a3e),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* ICH10 */
- { PCI_DEVICE(0x8086, 0x3a6e),
- .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+ { PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
/* Generic Intel */
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
.class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
.class_mask = 0xffffff,
.driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },
/* ATI SB 450/600/700/800/900 */
- { PCI_DEVICE(0x1002, 0x437b),
+ { PCI_VDEVICE(ATI, 0x437b),
.driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
- { PCI_DEVICE(0x1002, 0x4383),
+ { PCI_VDEVICE(ATI, 0x4383),
.driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
/* AMD Hudson */
- { PCI_DEVICE(0x1022, 0x780d),
+ { PCI_VDEVICE(AMD, 0x780d),
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
/* AMD, X370 & co */
- { PCI_DEVICE(0x1022, 0x1457),
+ { PCI_VDEVICE(AMD, 0x1457),
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
/* AMD, X570 & co */
- { PCI_DEVICE(0x1022, 0x1487),
+ { PCI_VDEVICE(AMD, 0x1487),
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
/* AMD Stoney */
- { PCI_DEVICE(0x1022, 0x157a),
+ { PCI_VDEVICE(AMD, 0x157a),
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
AZX_DCAPS_PM_RUNTIME },
/* AMD Raven */
- { PCI_DEVICE(0x1022, 0x15e3),
+ { PCI_VDEVICE(AMD, 0x15e3),
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
/* ATI HDMI */
- { PCI_DEVICE(0x1002, 0x0002),
+ { PCI_VDEVICE(ATI, 0x0002),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0x1308),
+ { PCI_VDEVICE(ATI, 0x1308),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0x157a),
+ { PCI_VDEVICE(ATI, 0x157a),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0x15b3),
+ { PCI_VDEVICE(ATI, 0x15b3),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0x793b),
+ { PCI_VDEVICE(ATI, 0x793b),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0x7919),
+ { PCI_VDEVICE(ATI, 0x7919),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0x960f),
+ { PCI_VDEVICE(ATI, 0x960f),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0x970f),
+ { PCI_VDEVICE(ATI, 0x970f),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0x9840),
+ { PCI_VDEVICE(ATI, 0x9840),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0xaa00),
+ { PCI_VDEVICE(ATI, 0xaa00),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa08),
+ { PCI_VDEVICE(ATI, 0xaa08),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa10),
+ { PCI_VDEVICE(ATI, 0xaa10),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa18),
+ { PCI_VDEVICE(ATI, 0xaa18),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa20),
+ { PCI_VDEVICE(ATI, 0xaa20),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa28),
+ { PCI_VDEVICE(ATI, 0xaa28),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa30),
+ { PCI_VDEVICE(ATI, 0xaa30),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa38),
+ { PCI_VDEVICE(ATI, 0xaa38),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa40),
+ { PCI_VDEVICE(ATI, 0xaa40),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa48),
+ { PCI_VDEVICE(ATI, 0xaa48),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa50),
+ { PCI_VDEVICE(ATI, 0xaa50),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa58),
+ { PCI_VDEVICE(ATI, 0xaa58),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa60),
+ { PCI_VDEVICE(ATI, 0xaa60),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa68),
+ { PCI_VDEVICE(ATI, 0xaa68),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa80),
+ { PCI_VDEVICE(ATI, 0xaa80),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa88),
+ { PCI_VDEVICE(ATI, 0xaa88),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa90),
+ { PCI_VDEVICE(ATI, 0xaa90),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0xaa98),
+ { PCI_VDEVICE(ATI, 0xaa98),
.driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
- { PCI_DEVICE(0x1002, 0x9902),
+ { PCI_VDEVICE(ATI, 0x9902),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0xaaa0),
+ { PCI_VDEVICE(ATI, 0xaaa0),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0xaaa8),
+ { PCI_VDEVICE(ATI, 0xaaa8),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0xaab0),
+ { PCI_VDEVICE(ATI, 0xaab0),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
- { PCI_DEVICE(0x1002, 0xaac0),
+ { PCI_VDEVICE(ATI, 0xaac0),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xaac8),
+ { PCI_VDEVICE(ATI, 0xaac8),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xaad8),
+ { PCI_VDEVICE(ATI, 0xaad8),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xaae0),
+ { PCI_VDEVICE(ATI, 0xaae0),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xaae8),
+ { PCI_VDEVICE(ATI, 0xaae8),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xaaf0),
+ { PCI_VDEVICE(ATI, 0xaaf0),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xaaf8),
+ { PCI_VDEVICE(ATI, 0xaaf8),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab00),
+ { PCI_VDEVICE(ATI, 0xab00),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab08),
+ { PCI_VDEVICE(ATI, 0xab08),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab10),
+ { PCI_VDEVICE(ATI, 0xab10),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab18),
+ { PCI_VDEVICE(ATI, 0xab18),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab20),
+ { PCI_VDEVICE(ATI, 0xab20),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab28),
+ { PCI_VDEVICE(ATI, 0xab28),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab30),
+ { PCI_VDEVICE(ATI, 0xab30),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
- { PCI_DEVICE(0x1002, 0xab38),
+ { PCI_VDEVICE(ATI, 0xab38),
.driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
AZX_DCAPS_PM_RUNTIME },
/* GLENFLY */
@@ -2752,15 +2681,15 @@ static const struct pci_device_id azx_ids[] = {
.driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
/* VIA VT8251/VT8237A */
- { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
+ { PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
/* VIA GFX VT7122/VX900 */
- { PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
+ { PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
/* VIA GFX VT6122/VX11 */
- { PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
+ { PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
/* SIS966 */
- { PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
+ { PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
/* ULI M5461 */
- { PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
+ { PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
/* NVIDIA MCP */
{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
.class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
@@ -2773,9 +2702,9 @@ static const struct pci_device_id azx_ids[] = {
.driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
/* Creative X-Fi (CA0110-IBG) */
/* CTHDA chips */
- { PCI_DEVICE(0x1102, 0x0010),
+ { PCI_VDEVICE(CREATIVE, 0x0010),
.driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
- { PCI_DEVICE(0x1102, 0x0012),
+ { PCI_VDEVICE(CREATIVE, 0x0012),
.driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
#if !IS_ENABLED(CONFIG_SND_CTXFI)
/* the following entry conflicts with snd-ctxfi driver,
@@ -2789,18 +2718,18 @@ static const struct pci_device_id azx_ids[] = {
AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
#else
/* this entry seems still valid -- i.e. without emu20kx chip */
- { PCI_DEVICE(0x1102, 0x0009),
+ { PCI_VDEVICE(CREATIVE, 0x0009),
.driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
#endif
/* CM8888 */
- { PCI_DEVICE(0x13f6, 0x5011),
+ { PCI_VDEVICE(CMEDIA, 0x5011),
.driver_data = AZX_DRIVER_CMEDIA |
AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
/* Vortex86MX */
- { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
+ { PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
/* VMware HDAudio */
- { PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
+ { PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
.class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
@@ -2811,11 +2740,11 @@ static const struct pci_device_id azx_ids[] = {
.class_mask = 0xffffff,
.driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
/* Zhaoxin */
- { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
+ { PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
/* Loongson HDAudio*/
- {PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
+ { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
.driver_data = AZX_DRIVER_LOONGSON },
- {PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
+ { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
.driver_data = AZX_DRIVER_LOONGSON },
{ 0, }
};
--
2.34.1
Some of the PCI IDs are not sorted correctly, reorder them by growing ID
number.
Signed-off-by: Amadeusz Sławiński <[email protected]>
---
include/linux/pci_ids.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2dc75df1437f..add7fb6bd844 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2677,8 +2677,6 @@
#define PCI_DEVICE_ID_INTEL_82815_MC 0x1130
#define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132
#define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221
-#define PCI_DEVICE_ID_INTEL_7505_0 0x2550
-#define PCI_DEVICE_ID_INTEL_7205_0 0x255d
#define PCI_DEVICE_ID_INTEL_82437 0x122d
#define PCI_DEVICE_ID_INTEL_82371FB_0 0x122e
#define PCI_DEVICE_ID_INTEL_82371FB_1 0x1230
@@ -2772,6 +2770,8 @@
#define PCI_DEVICE_ID_INTEL_82850_HB 0x2530
#define PCI_DEVICE_ID_INTEL_82860_HB 0x2531
#define PCI_DEVICE_ID_INTEL_E7501_MCH 0x254c
+#define PCI_DEVICE_ID_INTEL_7505_0 0x2550
+#define PCI_DEVICE_ID_INTEL_7205_0 0x255d
#define PCI_DEVICE_ID_INTEL_82845G_HB 0x2560
#define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562
#define PCI_DEVICE_ID_INTEL_82865_HB 0x2570
@@ -2806,9 +2806,9 @@
#define PCI_DEVICE_ID_INTEL_3000_HB 0x2778
#define PCI_DEVICE_ID_INTEL_82945GM_HB 0x27a0
#define PCI_DEVICE_ID_INTEL_82945GM_IG 0x27a2
+#define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0
#define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8
#define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9
-#define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0
#define PCI_DEVICE_ID_INTEL_TGP_LPC 0x27bc
#define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd
#define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da
@@ -2824,14 +2824,14 @@
#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850
#define PCI_DEVICE_ID_INTEL_VMD_28C0 0x28c0
#define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910
-#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2917
#define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912
#define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913
#define PCI_DEVICE_ID_INTEL_ICH9_4 0x2914
-#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2919
-#define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930
#define PCI_DEVICE_ID_INTEL_ICH9_7 0x2916
+#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2917
#define PCI_DEVICE_ID_INTEL_ICH9_8 0x2918
+#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2919
+#define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930
#define PCI_DEVICE_ID_INTEL_I7_MCR 0x2c18
#define PCI_DEVICE_ID_INTEL_I7_MC_TAD 0x2c19
#define PCI_DEVICE_ID_INTEL_I7_MC_RAS 0x2c1a
@@ -2848,8 +2848,8 @@
#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR 0x2c31
#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK 0x2c32
#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC 0x2c33
-#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
#define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
+#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
#define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE 0x2c50
#define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT 0x2c51
#define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2 0x2c70
@@ -2895,10 +2895,10 @@
#define PCI_DEVICE_ID_INTEL_IOAT_TBG3 0x3433
#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575
#define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
-#define PCI_DEVICE_ID_INTEL_82854_HB 0x358c
-#define PCI_DEVICE_ID_INTEL_82854_IG 0x358e
#define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
#define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582
+#define PCI_DEVICE_ID_INTEL_82854_HB 0x358c
+#define PCI_DEVICE_ID_INTEL_82854_IG 0x358e
#define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590
#define PCI_DEVICE_ID_INTEL_E7320_MCH 0x3592
#define PCI_DEVICE_ID_INTEL_MCH_PA 0x3595
@@ -2908,11 +2908,11 @@
#define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
#define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
#define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
+#define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b
+#define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c
#define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c
#define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f
#define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610
-#define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b
-#define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c
#define PCI_DEVICE_ID_INTEL_IOAT_JSF0 0x3710
#define PCI_DEVICE_ID_INTEL_IOAT_JSF1 0x3711
#define PCI_DEVICE_ID_INTEL_IOAT_JSF2 0x3712
@@ -2943,16 +2943,12 @@
#define PCI_DEVICE_ID_INTEL_IOAT_SNB7 0x3c27
#define PCI_DEVICE_ID_INTEL_IOAT_SNB8 0x3c2e
#define PCI_DEVICE_ID_INTEL_IOAT_SNB9 0x3c2f
-#define PCI_DEVICE_ID_INTEL_UNC_HA 0x3c46
-#define PCI_DEVICE_ID_INTEL_UNC_IMC0 0x3cb0
-#define PCI_DEVICE_ID_INTEL_UNC_IMC1 0x3cb1
-#define PCI_DEVICE_ID_INTEL_UNC_IMC2 0x3cb4
-#define PCI_DEVICE_ID_INTEL_UNC_IMC3 0x3cb5
#define PCI_DEVICE_ID_INTEL_UNC_QPI0 0x3c41
#define PCI_DEVICE_ID_INTEL_UNC_QPI1 0x3c42
#define PCI_DEVICE_ID_INTEL_UNC_R2PCIE 0x3c43
#define PCI_DEVICE_ID_INTEL_UNC_R3QPI0 0x3c44
#define PCI_DEVICE_ID_INTEL_UNC_R3QPI1 0x3c45
+#define PCI_DEVICE_ID_INTEL_UNC_HA 0x3c46
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS 0x3c71 /* 15.1 */
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0 0x3c72 /* 16.2 */
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1 0x3c73 /* 16.3 */
@@ -2964,6 +2960,10 @@
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1 0x3cab /* 15.3 */
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2 0x3cac /* 15.4 */
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3 0x3cad /* 15.5 */
+#define PCI_DEVICE_ID_INTEL_UNC_IMC0 0x3cb0
+#define PCI_DEVICE_ID_INTEL_UNC_IMC1 0x3cb1
+#define PCI_DEVICE_ID_INTEL_UNC_IMC2 0x3cb4
+#define PCI_DEVICE_ID_INTEL_UNC_IMC3 0x3cb5
#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO 0x3cb8 /* 17.0 */
#define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX 0x3ce0
#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */
--
2.34.1
On Tue, Jul 11, 2023 at 02:57:21PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header and while at it to simplify
> declarations change to using PCI_DEVICE_DATA() macro for Intel IDs and
> PCI_VDEVICE() for all other that have defined vendor.
FWIW,
Reviewed-by: Andy Shevchenko <[email protected]>
See nit-pick below.
> Acked-by: Mark Brown <[email protected]>
> Signed-off-by: Amadeusz Sławiński <[email protected]>
> ---
> sound/pci/hda/hda_intel.c | 353 +++++++++++++++-----------------------
> 1 file changed, 141 insertions(+), 212 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 143efa54b9bf..4a162f27b46e 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2416,333 +2416,262 @@ static void azx_shutdown(struct pci_dev *pci)
> /* PCI IDs */
> static const struct pci_device_id azx_ids[] = {
> /* CPT */
> - { PCI_DEVICE(0x8086, 0x1c20),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> + { PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
> /* PBG */
> - { PCI_DEVICE(0x8086, 0x1d20),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> + { PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
> /* Panther Point */
> - { PCI_DEVICE(0x8086, 0x1e20),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> + { PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
> /* Lynx Point */
> - { PCI_DEVICE(0x8086, 0x8c20),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> + { PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> /* 9 Series */
> - { PCI_DEVICE(0x8086, 0x8ca0),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> + { PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> /* Wellsburg */
> - { PCI_DEVICE(0x8086, 0x8d20),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> - { PCI_DEVICE(0x8086, 0x8d21),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> + { PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> + { PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> /* Lewisburg */
> - { PCI_DEVICE(0x8086, 0xa1f0),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
> - { PCI_DEVICE(0x8086, 0xa270),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
> + { PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Lynx Point-LP */
> - { PCI_DEVICE(0x8086, 0x9c20),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> + { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> /* Lynx Point-LP */
> - { PCI_DEVICE(0x8086, 0x9c21),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> + { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> /* Wildcat Point-LP */
> - { PCI_DEVICE(0x8086, 0x9ca0),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> - /* Sunrise Point */
> - { PCI_DEVICE(0x8086, 0xa170),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> - /* Sunrise Point-LP */
> - { PCI_DEVICE(0x8086, 0x9d70),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> + { PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> + /* Skylake (Sunrise Point) */
> + { PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + /* Skylake-LP (Sunrise Point-LP) */
> + { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Kabylake */
> - { PCI_DEVICE(0x8086, 0xa171),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> + { PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Kabylake-LP */
> - { PCI_DEVICE(0x8086, 0x9d71),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> + { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Kabylake-H */
> - { PCI_DEVICE(0x8086, 0xa2f0),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> + { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Coffelake */
> - { PCI_DEVICE(0x8086, 0xa348),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Cannonlake */
> - { PCI_DEVICE(0x8086, 0x9dc8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* CometLake-LP */
> - { PCI_DEVICE(0x8086, 0x02C8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* CometLake-H */
> - { PCI_DEVICE(0x8086, 0x06C8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0xf1c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* CometLake-S */
> - { PCI_DEVICE(0x8086, 0xa3f0),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* CometLake-R */
> - { PCI_DEVICE(0x8086, 0xf0c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Icelake */
> - { PCI_DEVICE(0x8086, 0x34c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Icelake-H */
> - { PCI_DEVICE(0x8086, 0x3dc8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Jasperlake */
> - { PCI_DEVICE(0x8086, 0x38c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x4dc8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Tigerlake */
> - { PCI_DEVICE(0x8086, 0xa0c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Tigerlake-H */
> - { PCI_DEVICE(0x8086, 0x43c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* DG1 */
> - { PCI_DEVICE(0x8086, 0x490d),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* DG2 */
> - { PCI_DEVICE(0x8086, 0x4f90),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x4f91),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x4f92),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Alderlake-S */
> - { PCI_DEVICE(0x8086, 0x7ad0),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Alderlake-P */
> - { PCI_DEVICE(0x8086, 0x51c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x51c9),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x51cd),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Alderlake-M */
> - { PCI_DEVICE(0x8086, 0x51cc),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Alderlake-N */
> - { PCI_DEVICE(0x8086, 0x54c8),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Elkhart Lake */
> - { PCI_DEVICE(0x8086, 0x4b55),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x4b58),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Raptor Lake */
> - { PCI_DEVICE(0x8086, 0x7a50),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x51ca),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x51cb),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x51ce),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - { PCI_DEVICE(0x8086, 0x51cf),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - /* Meteorlake-P */
> - { PCI_DEVICE(0x8086, 0x7e28),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + { PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> /* Lunarlake-P */
> - { PCI_DEVICE(0x8086, 0xa828),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> - /* Broxton-P(Apollolake) */
> - { PCI_DEVICE(0x8086, 0x5a98),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
> + { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> + /* Apollolake (Broxton-P) */
> + { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
> /* Broxton-T */
> - { PCI_DEVICE(0x8086, 0x1a98),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
> + { PCI_DEVICE_DATA(INTEL, HDA_APL_T, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
> /* Gemini-Lake */
> - { PCI_DEVICE(0x8086, 0x3198),
> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
> + { PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
> /* Haswell */
> - { PCI_DEVICE(0x8086, 0x0a0c),
> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
> - { PCI_DEVICE(0x8086, 0x0c0c),
> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
> - { PCI_DEVICE(0x8086, 0x0d0c),
> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
> + { PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
> + { PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
> + { PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
> /* Broadwell */
> - { PCI_DEVICE(0x8086, 0x160c),
> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
> + { PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
> /* 5 Series/3400 */
> - { PCI_DEVICE(0x8086, 0x3b56),
> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
> - { PCI_DEVICE(0x8086, 0x3b57),
> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
> + { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
> + { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
> /* Poulsbo */
> - { PCI_DEVICE(0x8086, 0x811b),
> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
> - AZX_DCAPS_POSFIX_LPIB },
> + { PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
> + AZX_DCAPS_POSFIX_LPIB) },
> /* Oaktrail */
> - { PCI_DEVICE(0x8086, 0x080a),
> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
> + { PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
> /* BayTrail */
> - { PCI_DEVICE(0x8086, 0x0f04),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
> + { PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
> /* Braswell */
> - { PCI_DEVICE(0x8086, 0x2284),
> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
> + { PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
> /* ICH6 */
> - { PCI_DEVICE(0x8086, 0x2668),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ICH7 */
> - { PCI_DEVICE(0x8086, 0x27d8),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ESB2 */
> - { PCI_DEVICE(0x8086, 0x269a),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ICH8 */
> - { PCI_DEVICE(0x8086, 0x284b),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ICH9 */
> - { PCI_DEVICE(0x8086, 0x293e),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ICH9 */
> - { PCI_DEVICE(0x8086, 0x293f),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ICH10 */
> - { PCI_DEVICE(0x8086, 0x3a3e),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* ICH10 */
> - { PCI_DEVICE(0x8086, 0x3a6e),
> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> + { PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
> /* Generic Intel */
> { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
> .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
> .class_mask = 0xffffff,
> .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },
> /* ATI SB 450/600/700/800/900 */
> - { PCI_DEVICE(0x1002, 0x437b),
> + { PCI_VDEVICE(ATI, 0x437b),
> .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
> - { PCI_DEVICE(0x1002, 0x4383),
> + { PCI_VDEVICE(ATI, 0x4383),
> .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
I know that AMD owns ATI, but wouldn't make sense to group by company?
Maybe as a separate (preparatory?) patch.
> /* AMD Hudson */
> - { PCI_DEVICE(0x1022, 0x780d),
> + { PCI_VDEVICE(AMD, 0x780d),
> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
> /* AMD, X370 & co */
> - { PCI_DEVICE(0x1022, 0x1457),
> + { PCI_VDEVICE(AMD, 0x1457),
> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
> /* AMD, X570 & co */
> - { PCI_DEVICE(0x1022, 0x1487),
> + { PCI_VDEVICE(AMD, 0x1487),
> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
> /* AMD Stoney */
> - { PCI_DEVICE(0x1022, 0x157a),
> + { PCI_VDEVICE(AMD, 0x157a),
> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
> AZX_DCAPS_PM_RUNTIME },
> /* AMD Raven */
> - { PCI_DEVICE(0x1022, 0x15e3),
> + { PCI_VDEVICE(AMD, 0x15e3),
> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
> /* ATI HDMI */
> - { PCI_DEVICE(0x1002, 0x0002),
> + { PCI_VDEVICE(ATI, 0x0002),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0x1308),
> + { PCI_VDEVICE(ATI, 0x1308),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0x157a),
> + { PCI_VDEVICE(ATI, 0x157a),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0x15b3),
> + { PCI_VDEVICE(ATI, 0x15b3),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0x793b),
> + { PCI_VDEVICE(ATI, 0x793b),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0x7919),
> + { PCI_VDEVICE(ATI, 0x7919),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0x960f),
> + { PCI_VDEVICE(ATI, 0x960f),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0x970f),
> + { PCI_VDEVICE(ATI, 0x970f),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0x9840),
> + { PCI_VDEVICE(ATI, 0x9840),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0xaa00),
> + { PCI_VDEVICE(ATI, 0xaa00),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa08),
> + { PCI_VDEVICE(ATI, 0xaa08),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa10),
> + { PCI_VDEVICE(ATI, 0xaa10),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa18),
> + { PCI_VDEVICE(ATI, 0xaa18),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa20),
> + { PCI_VDEVICE(ATI, 0xaa20),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa28),
> + { PCI_VDEVICE(ATI, 0xaa28),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa30),
> + { PCI_VDEVICE(ATI, 0xaa30),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa38),
> + { PCI_VDEVICE(ATI, 0xaa38),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa40),
> + { PCI_VDEVICE(ATI, 0xaa40),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa48),
> + { PCI_VDEVICE(ATI, 0xaa48),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa50),
> + { PCI_VDEVICE(ATI, 0xaa50),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa58),
> + { PCI_VDEVICE(ATI, 0xaa58),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa60),
> + { PCI_VDEVICE(ATI, 0xaa60),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa68),
> + { PCI_VDEVICE(ATI, 0xaa68),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa80),
> + { PCI_VDEVICE(ATI, 0xaa80),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa88),
> + { PCI_VDEVICE(ATI, 0xaa88),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa90),
> + { PCI_VDEVICE(ATI, 0xaa90),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0xaa98),
> + { PCI_VDEVICE(ATI, 0xaa98),
> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> - { PCI_DEVICE(0x1002, 0x9902),
> + { PCI_VDEVICE(ATI, 0x9902),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0xaaa0),
> + { PCI_VDEVICE(ATI, 0xaaa0),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0xaaa8),
> + { PCI_VDEVICE(ATI, 0xaaa8),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0xaab0),
> + { PCI_VDEVICE(ATI, 0xaab0),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> - { PCI_DEVICE(0x1002, 0xaac0),
> + { PCI_VDEVICE(ATI, 0xaac0),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xaac8),
> + { PCI_VDEVICE(ATI, 0xaac8),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xaad8),
> + { PCI_VDEVICE(ATI, 0xaad8),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xaae0),
> + { PCI_VDEVICE(ATI, 0xaae0),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xaae8),
> + { PCI_VDEVICE(ATI, 0xaae8),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xaaf0),
> + { PCI_VDEVICE(ATI, 0xaaf0),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xaaf8),
> + { PCI_VDEVICE(ATI, 0xaaf8),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab00),
> + { PCI_VDEVICE(ATI, 0xab00),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab08),
> + { PCI_VDEVICE(ATI, 0xab08),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab10),
> + { PCI_VDEVICE(ATI, 0xab10),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab18),
> + { PCI_VDEVICE(ATI, 0xab18),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab20),
> + { PCI_VDEVICE(ATI, 0xab20),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab28),
> + { PCI_VDEVICE(ATI, 0xab28),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab30),
> + { PCI_VDEVICE(ATI, 0xab30),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> - { PCI_DEVICE(0x1002, 0xab38),
> + { PCI_VDEVICE(ATI, 0xab38),
> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
> AZX_DCAPS_PM_RUNTIME },
> /* GLENFLY */
> @@ -2752,15 +2681,15 @@ static const struct pci_device_id azx_ids[] = {
> .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
> AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
> /* VIA VT8251/VT8237A */
> - { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
> + { PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
> /* VIA GFX VT7122/VX900 */
> - { PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
> + { PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
> /* VIA GFX VT6122/VX11 */
> - { PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
> + { PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
> /* SIS966 */
> - { PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
> + { PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
> /* ULI M5461 */
> - { PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
> + { PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
> /* NVIDIA MCP */
> { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
> .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
> @@ -2773,9 +2702,9 @@ static const struct pci_device_id azx_ids[] = {
> .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
> /* Creative X-Fi (CA0110-IBG) */
> /* CTHDA chips */
> - { PCI_DEVICE(0x1102, 0x0010),
> + { PCI_VDEVICE(CREATIVE, 0x0010),
> .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
> - { PCI_DEVICE(0x1102, 0x0012),
> + { PCI_VDEVICE(CREATIVE, 0x0012),
> .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
> #if !IS_ENABLED(CONFIG_SND_CTXFI)
> /* the following entry conflicts with snd-ctxfi driver,
> @@ -2789,18 +2718,18 @@ static const struct pci_device_id azx_ids[] = {
> AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
> #else
> /* this entry seems still valid -- i.e. without emu20kx chip */
> - { PCI_DEVICE(0x1102, 0x0009),
> + { PCI_VDEVICE(CREATIVE, 0x0009),
> .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
> AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
> #endif
> /* CM8888 */
> - { PCI_DEVICE(0x13f6, 0x5011),
> + { PCI_VDEVICE(CMEDIA, 0x5011),
> .driver_data = AZX_DRIVER_CMEDIA |
> AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
> /* Vortex86MX */
> - { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
> + { PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
> /* VMware HDAudio */
> - { PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
> + { PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
> /* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
> { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
> .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
> @@ -2811,11 +2740,11 @@ static const struct pci_device_id azx_ids[] = {
> .class_mask = 0xffffff,
> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
> /* Zhaoxin */
> - { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
> + { PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
> /* Loongson HDAudio*/
> - {PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
> + { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
> .driver_data = AZX_DRIVER_LOONGSON },
> - {PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
> + { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
> .driver_data = AZX_DRIVER_LOONGSON },
> { 0, }
> };
> --
> 2.34.1
>
--
With Best Regards,
Andy Shevchenko
On 7/11/23 14:57, Amadeusz Sławiński wrote:
> PCI IDs for Intel HDA are duplicated across quite a few drivers, due to
> various configurations and historical reasons. Currently almost all uses
> of HDA PCI IDs have corresponding comment telling which platform it is.
> Additionally there are some inconsistencies between drivers about which
> ID corresponds to which device.
>
> Simplify things, by adding PCI IDs to global header and make use of them
> in drivers. This allows for removal of comments by having IDs themselves
> being self explanatory. Additionally it allows for removal of existing
> inconsistencies by having one source of truth.
I'd like to hear from Takashi and Mark on how this would work, we have
to provide new PCI IDs for both trees using a common 'pci_ids.h' file.
It's not science fiction, we have new PCI IDs for ArrowLake and LunarLake:
https://github.com/thesofproject/linux/pull/4437
https://github.com/thesofproject/linux/pull/4425
> Changes from RFC:
> - Sort Intel PCI IDs before adding new ones
> - Fix ordering of new PCI IDs (Andy)
> - Define all used Intel IDs (Andy)
> - Add macros for controller type detection (Andy/Bjorn)
> - Add set of patches changing to use above macro (Andy/Bjorn)
> - Use PCI_DEVICE_DATA for Intel IDs in sound/pci/hda/hda_intel.c (Andy)
> - Commit message wording (Andy)
> - Remove unnecessary tabs (Andy)
>
> Amadeusz Sławiński (13):
> PCI: Sort Intel PCI IDs by number
> PCI: Add Intel Audio DSP devices to pci_ids.h
> ALSA: hda: Add controller matching macros
> ALSA: hda: Use global PCI match macro
> ALSA: hda/i915: Use global PCI match macro
> ASoC: Intel: Skylake: Use global PCI match macro
> ALSA: intel-dsp-config: Convert to PCI device IDs defines
> ALSA: hda: Convert to PCI device IDs defines
> ASoC: Intel: avs: Convert to PCI device IDs defines
> ASoC: Intel: avs: Convert to PCI device IDs defines
> ASoC: Intel: Skylake: Convert to PCI device IDs defines
> ASoC: SOF: Intel: Convert to PCI device IDs defines
> ASoC: Intel: sst: Convert to PCI device IDs defines
>
> include/linux/pci_ids.h | 104 +++++--
> include/sound/hda_codec.h | 3 -
> include/sound/hdaudio.h | 27 ++
> sound/hda/hdac_i915.c | 7 +-
> sound/hda/intel-dsp-config.c | 119 ++++----
> sound/pci/hda/hda_intel.c | 373 ++++++++++---------------
> sound/soc/intel/atom/sst/sst.c | 3 +-
> sound/soc/intel/atom/sst/sst.h | 1 -
> sound/soc/intel/atom/sst/sst_pci.c | 4 +-
> sound/soc/intel/avs/board_selection.c | 10 +-
> sound/soc/intel/avs/core.c | 16 +-
> sound/soc/intel/skylake/skl-messages.c | 16 +-
> sound/soc/intel/skylake/skl-pcm.c | 3 +-
> sound/soc/intel/skylake/skl.c | 36 +--
> sound/soc/sof/intel/pci-apl.c | 9 +-
> sound/soc/sof/intel/pci-cnl.c | 15 +-
> sound/soc/sof/intel/pci-icl.c | 12 +-
> sound/soc/sof/intel/pci-mtl.c | 3 +-
> sound/soc/sof/intel/pci-skl.c | 6 +-
> sound/soc/sof/intel/pci-tgl.c | 45 +--
> sound/soc/sof/intel/pci-tng.c | 3 +-
> 21 files changed, 384 insertions(+), 431 deletions(-)
>
On Tue, Jul 11, 2023 at 05:24:07PM +0200, Pierre-Louis Bossart wrote:
> On 7/11/23 14:57, Amadeusz Sławiński wrote:
> > Simplify things, by adding PCI IDs to global header and make use of them
> > in drivers. This allows for removal of comments by having IDs themselves
> > being self explanatory. Additionally it allows for removal of existing
> > inconsistencies by having one source of truth.
> I'd like to hear from Takashi and Mark on how this would work, we have
> to provide new PCI IDs for both trees using a common 'pci_ids.h' file.
We can probably just agree on a tree to apply things and work from
there. It does make for a bit more friction though, you're right there.
On Tue, 11 Jul 2023 17:36:20 +0200,
Mark Brown wrote:
>
> On Tue, Jul 11, 2023 at 05:24:07PM +0200, Pierre-Louis Bossart wrote:
> > On 7/11/23 14:57, Amadeusz S?awi?ski wrote:
>
> > > Simplify things, by adding PCI IDs to global header and make use of them
> > > in drivers. This allows for removal of comments by having IDs themselves
> > > being self explanatory. Additionally it allows for removal of existing
> > > inconsistencies by having one source of truth.
>
> > I'd like to hear from Takashi and Mark on how this would work, we have
> > to provide new PCI IDs for both trees using a common 'pci_ids.h' file.
>
> We can probably just agree on a tree to apply things and work from
> there.
Yes, simply apply on top of 6.5-rc1 or such a stable point and tag it.
Then other trees can merging it.
I can do it if both Bjorn and Mark agree (after all patches get
reviewed and no objection comes up).
Takashi
On Tue, Jul 11, 2023 at 05:42:13PM +0200, Takashi Iwai wrote:
> I can do it if both Bjorn and Mark agree (after all patches get
> reviewed and no objection comes up).
Fine by me, I acked on the basis that it probably makes more sense in
someone else's tree.
On Tue, Jul 11, 2023 at 02:57:14PM +0200, Amadeusz Sławiński wrote:
> Some of the PCI IDs are not sorted correctly, reorder them by growing ID
> number.
>
> Signed-off-by: Amadeusz Sławiński <[email protected]>
Acked-by: Bjorn Helgaas <[email protected]>
> ---
> include/linux/pci_ids.h | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 2dc75df1437f..add7fb6bd844 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2677,8 +2677,6 @@
> #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130
> #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132
> #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221
> -#define PCI_DEVICE_ID_INTEL_7505_0 0x2550
> -#define PCI_DEVICE_ID_INTEL_7205_0 0x255d
> #define PCI_DEVICE_ID_INTEL_82437 0x122d
> #define PCI_DEVICE_ID_INTEL_82371FB_0 0x122e
> #define PCI_DEVICE_ID_INTEL_82371FB_1 0x1230
> @@ -2772,6 +2770,8 @@
> #define PCI_DEVICE_ID_INTEL_82850_HB 0x2530
> #define PCI_DEVICE_ID_INTEL_82860_HB 0x2531
> #define PCI_DEVICE_ID_INTEL_E7501_MCH 0x254c
> +#define PCI_DEVICE_ID_INTEL_7505_0 0x2550
> +#define PCI_DEVICE_ID_INTEL_7205_0 0x255d
> #define PCI_DEVICE_ID_INTEL_82845G_HB 0x2560
> #define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562
> #define PCI_DEVICE_ID_INTEL_82865_HB 0x2570
> @@ -2806,9 +2806,9 @@
> #define PCI_DEVICE_ID_INTEL_3000_HB 0x2778
> #define PCI_DEVICE_ID_INTEL_82945GM_HB 0x27a0
> #define PCI_DEVICE_ID_INTEL_82945GM_IG 0x27a2
> +#define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0
> #define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8
> #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9
> -#define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0
> #define PCI_DEVICE_ID_INTEL_TGP_LPC 0x27bc
> #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd
> #define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da
> @@ -2824,14 +2824,14 @@
> #define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850
> #define PCI_DEVICE_ID_INTEL_VMD_28C0 0x28c0
> #define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910
> -#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2917
> #define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912
> #define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913
> #define PCI_DEVICE_ID_INTEL_ICH9_4 0x2914
> -#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2919
> -#define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930
> #define PCI_DEVICE_ID_INTEL_ICH9_7 0x2916
> +#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2917
> #define PCI_DEVICE_ID_INTEL_ICH9_8 0x2918
> +#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2919
> +#define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930
> #define PCI_DEVICE_ID_INTEL_I7_MCR 0x2c18
> #define PCI_DEVICE_ID_INTEL_I7_MC_TAD 0x2c19
> #define PCI_DEVICE_ID_INTEL_I7_MC_RAS 0x2c1a
> @@ -2848,8 +2848,8 @@
> #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR 0x2c31
> #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK 0x2c32
> #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC 0x2c33
> -#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
> #define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
> +#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
> #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE 0x2c50
> #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT 0x2c51
> #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2 0x2c70
> @@ -2895,10 +2895,10 @@
> #define PCI_DEVICE_ID_INTEL_IOAT_TBG3 0x3433
> #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575
> #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
> -#define PCI_DEVICE_ID_INTEL_82854_HB 0x358c
> -#define PCI_DEVICE_ID_INTEL_82854_IG 0x358e
> #define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
> #define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582
> +#define PCI_DEVICE_ID_INTEL_82854_HB 0x358c
> +#define PCI_DEVICE_ID_INTEL_82854_IG 0x358e
> #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590
> #define PCI_DEVICE_ID_INTEL_E7320_MCH 0x3592
> #define PCI_DEVICE_ID_INTEL_MCH_PA 0x3595
> @@ -2908,11 +2908,11 @@
> #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
> #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
> #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
> +#define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b
> +#define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c
> #define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c
> #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f
> #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610
> -#define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b
> -#define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c
> #define PCI_DEVICE_ID_INTEL_IOAT_JSF0 0x3710
> #define PCI_DEVICE_ID_INTEL_IOAT_JSF1 0x3711
> #define PCI_DEVICE_ID_INTEL_IOAT_JSF2 0x3712
> @@ -2943,16 +2943,12 @@
> #define PCI_DEVICE_ID_INTEL_IOAT_SNB7 0x3c27
> #define PCI_DEVICE_ID_INTEL_IOAT_SNB8 0x3c2e
> #define PCI_DEVICE_ID_INTEL_IOAT_SNB9 0x3c2f
> -#define PCI_DEVICE_ID_INTEL_UNC_HA 0x3c46
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC0 0x3cb0
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC1 0x3cb1
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC2 0x3cb4
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC3 0x3cb5
> #define PCI_DEVICE_ID_INTEL_UNC_QPI0 0x3c41
> #define PCI_DEVICE_ID_INTEL_UNC_QPI1 0x3c42
> #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE 0x3c43
> #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0 0x3c44
> #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1 0x3c45
> +#define PCI_DEVICE_ID_INTEL_UNC_HA 0x3c46
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS 0x3c71 /* 15.1 */
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0 0x3c72 /* 16.2 */
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1 0x3c73 /* 16.3 */
> @@ -2964,6 +2960,10 @@
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1 0x3cab /* 15.3 */
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2 0x3cac /* 15.4 */
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3 0x3cad /* 15.5 */
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC0 0x3cb0
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC1 0x3cb1
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC2 0x3cb4
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC3 0x3cb5
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO 0x3cb8 /* 17.0 */
> #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX 0x3ce0
> #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */
> --
> 2.34.1
>
On Tue, Jul 11, 2023 at 05:42:13PM +0200, Takashi Iwai wrote:
> On Tue, 11 Jul 2023 17:36:20 +0200, Mark Brown wrote:
> > On Tue, Jul 11, 2023 at 05:24:07PM +0200, Pierre-Louis Bossart wrote:
> > > On 7/11/23 14:57, Amadeusz Sławiński wrote:
> >
> > > > Simplify things, by adding PCI IDs to global header and make use of them
> > > > in drivers. This allows for removal of comments by having IDs themselves
> > > > being self explanatory. Additionally it allows for removal of existing
> > > > inconsistencies by having one source of truth.
> >
> > > I'd like to hear from Takashi and Mark on how this would work, we have
> > > to provide new PCI IDs for both trees using a common 'pci_ids.h' file.
> >
> > We can probably just agree on a tree to apply things and work from
> > there.
>
> Yes, simply apply on top of 6.5-rc1 or such a stable point and tag it.
> Then other trees can merging it.
>
> I can do it if both Bjorn and Mark agree (after all patches get
> reviewed and no objection comes up).
Sure. I acked the PCI ones, so you can merge these via whatever tree
makes the most sense. We might have minor conflicts during the merge
window, but they should be easy to fix.
Bjorn
On 7/11/2023 4:07 PM, Andy Shevchenko wrote:
> On Tue, Jul 11, 2023 at 02:57:21PM +0200, Amadeusz Sławiński wrote:
>> Use PCI device IDs from pci_ids.h header and while at it to simplify
>> declarations change to using PCI_DEVICE_DATA() macro for Intel IDs and
>> PCI_VDEVICE() for all other that have defined vendor.
>
> FWIW,
> Reviewed-by: Andy Shevchenko <[email protected]>
> See nit-pick below.
>
>> Acked-by: Mark Brown <[email protected]>
>> Signed-off-by: Amadeusz Sławiński <[email protected]>
>> ---
>> sound/pci/hda/hda_intel.c | 353 +++++++++++++++-----------------------
>> 1 file changed, 141 insertions(+), 212 deletions(-)
>>
>> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
>> index 143efa54b9bf..4a162f27b46e 100644
>> --- a/sound/pci/hda/hda_intel.c
>> +++ b/sound/pci/hda/hda_intel.c
>> @@ -2416,333 +2416,262 @@ static void azx_shutdown(struct pci_dev *pci)
>> /* PCI IDs */
>> static const struct pci_device_id azx_ids[] = {
>> /* CPT */
>> - { PCI_DEVICE(0x8086, 0x1c20),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> + { PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>> /* PBG */
>> - { PCI_DEVICE(0x8086, 0x1d20),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> + { PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>> /* Panther Point */
>> - { PCI_DEVICE(0x8086, 0x1e20),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> + { PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>> /* Lynx Point */
>> - { PCI_DEVICE(0x8086, 0x8c20),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> /* 9 Series */
>> - { PCI_DEVICE(0x8086, 0x8ca0),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> /* Wellsburg */
>> - { PCI_DEVICE(0x8086, 0x8d20),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> - { PCI_DEVICE(0x8086, 0x8d21),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> /* Lewisburg */
>> - { PCI_DEVICE(0x8086, 0xa1f0),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
>> - { PCI_DEVICE(0x8086, 0xa270),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
>> + { PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Lynx Point-LP */
>> - { PCI_DEVICE(0x8086, 0x9c20),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> /* Lynx Point-LP */
>> - { PCI_DEVICE(0x8086, 0x9c21),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> /* Wildcat Point-LP */
>> - { PCI_DEVICE(0x8086, 0x9ca0),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> - /* Sunrise Point */
>> - { PCI_DEVICE(0x8086, 0xa170),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> - /* Sunrise Point-LP */
>> - { PCI_DEVICE(0x8086, 0x9d70),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> + { PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> + /* Skylake (Sunrise Point) */
>> + { PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + /* Skylake-LP (Sunrise Point-LP) */
>> + { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Kabylake */
>> - { PCI_DEVICE(0x8086, 0xa171),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> + { PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Kabylake-LP */
>> - { PCI_DEVICE(0x8086, 0x9d71),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> + { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Kabylake-H */
>> - { PCI_DEVICE(0x8086, 0xa2f0),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> + { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Coffelake */
>> - { PCI_DEVICE(0x8086, 0xa348),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Cannonlake */
>> - { PCI_DEVICE(0x8086, 0x9dc8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* CometLake-LP */
>> - { PCI_DEVICE(0x8086, 0x02C8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* CometLake-H */
>> - { PCI_DEVICE(0x8086, 0x06C8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0xf1c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* CometLake-S */
>> - { PCI_DEVICE(0x8086, 0xa3f0),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* CometLake-R */
>> - { PCI_DEVICE(0x8086, 0xf0c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Icelake */
>> - { PCI_DEVICE(0x8086, 0x34c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Icelake-H */
>> - { PCI_DEVICE(0x8086, 0x3dc8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Jasperlake */
>> - { PCI_DEVICE(0x8086, 0x38c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x4dc8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Tigerlake */
>> - { PCI_DEVICE(0x8086, 0xa0c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Tigerlake-H */
>> - { PCI_DEVICE(0x8086, 0x43c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* DG1 */
>> - { PCI_DEVICE(0x8086, 0x490d),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* DG2 */
>> - { PCI_DEVICE(0x8086, 0x4f90),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x4f91),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x4f92),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Alderlake-S */
>> - { PCI_DEVICE(0x8086, 0x7ad0),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Alderlake-P */
>> - { PCI_DEVICE(0x8086, 0x51c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x51c9),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x51cd),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Alderlake-M */
>> - { PCI_DEVICE(0x8086, 0x51cc),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Alderlake-N */
>> - { PCI_DEVICE(0x8086, 0x54c8),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Elkhart Lake */
>> - { PCI_DEVICE(0x8086, 0x4b55),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x4b58),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Raptor Lake */
>> - { PCI_DEVICE(0x8086, 0x7a50),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x51ca),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x51cb),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x51ce),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - { PCI_DEVICE(0x8086, 0x51cf),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - /* Meteorlake-P */
>> - { PCI_DEVICE(0x8086, 0x7e28),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> /* Lunarlake-P */
>> - { PCI_DEVICE(0x8086, 0xa828),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> - /* Broxton-P(Apollolake) */
>> - { PCI_DEVICE(0x8086, 0x5a98),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
>> + { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> + /* Apollolake (Broxton-P) */
>> + { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>> /* Broxton-T */
>> - { PCI_DEVICE(0x8086, 0x1a98),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
>> + { PCI_DEVICE_DATA(INTEL, HDA_APL_T, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>> /* Gemini-Lake */
>> - { PCI_DEVICE(0x8086, 0x3198),
>> - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
>> + { PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>> /* Haswell */
>> - { PCI_DEVICE(0x8086, 0x0a0c),
>> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
>> - { PCI_DEVICE(0x8086, 0x0c0c),
>> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
>> - { PCI_DEVICE(0x8086, 0x0d0c),
>> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
>> + { PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>> /* Broadwell */
>> - { PCI_DEVICE(0x8086, 0x160c),
>> - .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
>> + { PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
>> /* 5 Series/3400 */
>> - { PCI_DEVICE(0x8086, 0x3b56),
>> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> - { PCI_DEVICE(0x8086, 0x3b57),
>> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> + { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>> + { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>> /* Poulsbo */
>> - { PCI_DEVICE(0x8086, 0x811b),
>> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
>> - AZX_DCAPS_POSFIX_LPIB },
>> + { PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
>> + AZX_DCAPS_POSFIX_LPIB) },
>> /* Oaktrail */
>> - { PCI_DEVICE(0x8086, 0x080a),
>> - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
>> + { PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
>> /* BayTrail */
>> - { PCI_DEVICE(0x8086, 0x0f04),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
>> + { PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
>> /* Braswell */
>> - { PCI_DEVICE(0x8086, 0x2284),
>> - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
>> + { PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
>> /* ICH6 */
>> - { PCI_DEVICE(0x8086, 0x2668),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ICH7 */
>> - { PCI_DEVICE(0x8086, 0x27d8),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ESB2 */
>> - { PCI_DEVICE(0x8086, 0x269a),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ICH8 */
>> - { PCI_DEVICE(0x8086, 0x284b),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ICH9 */
>> - { PCI_DEVICE(0x8086, 0x293e),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ICH9 */
>> - { PCI_DEVICE(0x8086, 0x293f),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ICH10 */
>> - { PCI_DEVICE(0x8086, 0x3a3e),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* ICH10 */
>> - { PCI_DEVICE(0x8086, 0x3a6e),
>> - .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> + { PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>> /* Generic Intel */
>> { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
>> .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>> .class_mask = 0xffffff,
>> .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },
>
>> /* ATI SB 450/600/700/800/900 */
>> - { PCI_DEVICE(0x1002, 0x437b),
>> + { PCI_VDEVICE(ATI, 0x437b),
>> .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
>> - { PCI_DEVICE(0x1002, 0x4383),
>> + { PCI_VDEVICE(ATI, 0x4383),
>> .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
>
> I know that AMD owns ATI, but wouldn't make sense to group by company?
> Maybe as a separate (preparatory?) patch.
>
It seems to be sorted this way because first are Generic ATI and AMD HDA
cards, followed by ATI HDMI ones. I would just leave it as it is unless
Takashi also prefers it to be reordered?
>> /* AMD Hudson */
>> - { PCI_DEVICE(0x1022, 0x780d),
>> + { PCI_VDEVICE(AMD, 0x780d),
>> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
>> /* AMD, X370 & co */
>> - { PCI_DEVICE(0x1022, 0x1457),
>> + { PCI_VDEVICE(AMD, 0x1457),
>> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>> /* AMD, X570 & co */
>> - { PCI_DEVICE(0x1022, 0x1487),
>> + { PCI_VDEVICE(AMD, 0x1487),
>> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>> /* AMD Stoney */
>> - { PCI_DEVICE(0x1022, 0x157a),
>> + { PCI_VDEVICE(AMD, 0x157a),
>> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
>> AZX_DCAPS_PM_RUNTIME },
>> /* AMD Raven */
>> - { PCI_DEVICE(0x1022, 0x15e3),
>> + { PCI_VDEVICE(AMD, 0x15e3),
>> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>> /* ATI HDMI */
>> - { PCI_DEVICE(0x1002, 0x0002),
>> + { PCI_VDEVICE(ATI, 0x0002),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0x1308),
>> + { PCI_VDEVICE(ATI, 0x1308),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0x157a),
>> + { PCI_VDEVICE(ATI, 0x157a),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0x15b3),
>> + { PCI_VDEVICE(ATI, 0x15b3),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0x793b),
>> + { PCI_VDEVICE(ATI, 0x793b),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0x7919),
>> + { PCI_VDEVICE(ATI, 0x7919),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0x960f),
>> + { PCI_VDEVICE(ATI, 0x960f),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0x970f),
>> + { PCI_VDEVICE(ATI, 0x970f),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0x9840),
>> + { PCI_VDEVICE(ATI, 0x9840),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0xaa00),
>> + { PCI_VDEVICE(ATI, 0xaa00),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa08),
>> + { PCI_VDEVICE(ATI, 0xaa08),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa10),
>> + { PCI_VDEVICE(ATI, 0xaa10),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa18),
>> + { PCI_VDEVICE(ATI, 0xaa18),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa20),
>> + { PCI_VDEVICE(ATI, 0xaa20),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa28),
>> + { PCI_VDEVICE(ATI, 0xaa28),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa30),
>> + { PCI_VDEVICE(ATI, 0xaa30),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa38),
>> + { PCI_VDEVICE(ATI, 0xaa38),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa40),
>> + { PCI_VDEVICE(ATI, 0xaa40),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa48),
>> + { PCI_VDEVICE(ATI, 0xaa48),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa50),
>> + { PCI_VDEVICE(ATI, 0xaa50),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa58),
>> + { PCI_VDEVICE(ATI, 0xaa58),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa60),
>> + { PCI_VDEVICE(ATI, 0xaa60),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa68),
>> + { PCI_VDEVICE(ATI, 0xaa68),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa80),
>> + { PCI_VDEVICE(ATI, 0xaa80),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa88),
>> + { PCI_VDEVICE(ATI, 0xaa88),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa90),
>> + { PCI_VDEVICE(ATI, 0xaa90),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0xaa98),
>> + { PCI_VDEVICE(ATI, 0xaa98),
>> .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> - { PCI_DEVICE(0x1002, 0x9902),
>> + { PCI_VDEVICE(ATI, 0x9902),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0xaaa0),
>> + { PCI_VDEVICE(ATI, 0xaaa0),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0xaaa8),
>> + { PCI_VDEVICE(ATI, 0xaaa8),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0xaab0),
>> + { PCI_VDEVICE(ATI, 0xaab0),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> - { PCI_DEVICE(0x1002, 0xaac0),
>> + { PCI_VDEVICE(ATI, 0xaac0),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xaac8),
>> + { PCI_VDEVICE(ATI, 0xaac8),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xaad8),
>> + { PCI_VDEVICE(ATI, 0xaad8),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xaae0),
>> + { PCI_VDEVICE(ATI, 0xaae0),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xaae8),
>> + { PCI_VDEVICE(ATI, 0xaae8),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xaaf0),
>> + { PCI_VDEVICE(ATI, 0xaaf0),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xaaf8),
>> + { PCI_VDEVICE(ATI, 0xaaf8),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab00),
>> + { PCI_VDEVICE(ATI, 0xab00),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab08),
>> + { PCI_VDEVICE(ATI, 0xab08),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab10),
>> + { PCI_VDEVICE(ATI, 0xab10),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab18),
>> + { PCI_VDEVICE(ATI, 0xab18),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab20),
>> + { PCI_VDEVICE(ATI, 0xab20),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab28),
>> + { PCI_VDEVICE(ATI, 0xab28),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab30),
>> + { PCI_VDEVICE(ATI, 0xab30),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> - { PCI_DEVICE(0x1002, 0xab38),
>> + { PCI_VDEVICE(ATI, 0xab38),
>> .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>> AZX_DCAPS_PM_RUNTIME },
>> /* GLENFLY */
>> @@ -2752,15 +2681,15 @@ static const struct pci_device_id azx_ids[] = {
>> .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
>> AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
>> /* VIA VT8251/VT8237A */
>> - { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
>> + { PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
>> /* VIA GFX VT7122/VX900 */
>> - { PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
>> + { PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
>> /* VIA GFX VT6122/VX11 */
>> - { PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
>> + { PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
>> /* SIS966 */
>> - { PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
>> + { PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
>> /* ULI M5461 */
>> - { PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
>> + { PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
>> /* NVIDIA MCP */
>> { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
>> .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>> @@ -2773,9 +2702,9 @@ static const struct pci_device_id azx_ids[] = {
>> .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
>> /* Creative X-Fi (CA0110-IBG) */
>> /* CTHDA chips */
>> - { PCI_DEVICE(0x1102, 0x0010),
>> + { PCI_VDEVICE(CREATIVE, 0x0010),
>> .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
>> - { PCI_DEVICE(0x1102, 0x0012),
>> + { PCI_VDEVICE(CREATIVE, 0x0012),
>> .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
>> #if !IS_ENABLED(CONFIG_SND_CTXFI)
>> /* the following entry conflicts with snd-ctxfi driver,
>> @@ -2789,18 +2718,18 @@ static const struct pci_device_id azx_ids[] = {
>> AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
>> #else
>> /* this entry seems still valid -- i.e. without emu20kx chip */
>> - { PCI_DEVICE(0x1102, 0x0009),
>> + { PCI_VDEVICE(CREATIVE, 0x0009),
>> .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
>> AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
>> #endif
>> /* CM8888 */
>> - { PCI_DEVICE(0x13f6, 0x5011),
>> + { PCI_VDEVICE(CMEDIA, 0x5011),
>> .driver_data = AZX_DRIVER_CMEDIA |
>> AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
>> /* Vortex86MX */
>> - { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
>> + { PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
>> /* VMware HDAudio */
>> - { PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
>> + { PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
>> /* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
>> { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
>> .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>> @@ -2811,11 +2740,11 @@ static const struct pci_device_id azx_ids[] = {
>> .class_mask = 0xffffff,
>> .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
>> /* Zhaoxin */
>> - { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
>> + { PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
>> /* Loongson HDAudio*/
>> - {PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
>> + { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
>> .driver_data = AZX_DRIVER_LOONGSON },
>> - {PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
>> + { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
>> .driver_data = AZX_DRIVER_LOONGSON },
>> { 0, }
>> };
>> --
>> 2.34.1
>>
>
On Wed, 12 Jul 2023 13:22:22 +0200,
Amadeusz S?awi?ski wrote:
>
> On 7/11/2023 4:07 PM, Andy Shevchenko wrote:
> > I know that AMD owns ATI, but wouldn't make sense to group by company?
> > Maybe as a separate (preparatory?) patch.
> >
>
> It seems to be sorted this way because first are Generic ATI and AMD
> HDA cards, followed by ATI HDMI ones. I would just leave it as it is
> unless Takashi also prefers it to be reordered?
Yes, these are some logical grouping :)
We may want to sort differently in future, but let's do it after all
things settle down.
thanks,
Takashi