lkml.org 
[lkml]   [2023]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 10/15] ALSA: hda: Convert to PCI device IDs defines
    Date
    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 <broonie@kernel.org>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
    ---
    sound/pci/hda/hda_intel.c | 350 +++++++++++++++-----------------------
    1 file changed, 140 insertions(+), 210 deletions(-)

    diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
    index 5e59dcc35665..176567f0d0e0 100644
    --- a/sound/pci/hda/hda_intel.c
    +++ b/sound/pci/hda/hda_intel.c
    @@ -2416,330 +2416,260 @@ 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) },
    /* 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 */
    @@ -2749,15 +2679,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,
    @@ -2770,9 +2700,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,
    @@ -2786,18 +2716,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,
    @@ -2808,11 +2738,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
    \
     
     \ /
      Last update: 2023-07-16 20:50    [W:4.421 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site