On Tue, Jul 11, 2023 at 02:57:23PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro,
> so device ID can be provided in short form.
FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Acked-by: Mark Brown <broonie@xxxxxxxxxx>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx>
> ---
> sound/soc/intel/avs/board_selection.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
> index 60f8fb0bff95..b32e02940e30 100644
> --- a/sound/soc/intel/avs/board_selection.c
> +++ b/sound/soc/intel/avs/board_selection.c
> @@ -263,14 +263,14 @@ struct avs_acpi_boards {
> };
>
> #define AVS_MACH_ENTRY(_id, _mach) \
> - { .id = (_id), .machs = (_mach), }
> + { .id = PCI_DEVICE_ID_INTEL_##_id, .machs = (_mach), }
>
> /* supported I2S boards per platform */
> static const struct avs_acpi_boards i2s_boards[] = {
> - AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */
> - AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */
> - AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */
> - AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */
> + AVS_MACH_ENTRY(HDA_SKL_LP, avs_skl_i2s_machines),
> + AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
> + AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
> + AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),
Maybe sort them by name?
> {},
> };
>
> --
> 2.34.1
>
--
With Best Regards,
Andy Shevchenko
