From nobody Tue Feb 10 01:23:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87296EB64DD for ; Tue, 11 Jul 2023 12:59:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232921AbjGKM7T (ORCPT ); Tue, 11 Jul 2023 08:59:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232837AbjGKM66 (ORCPT ); Tue, 11 Jul 2023 08:58:58 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3540A19A1; Tue, 11 Jul 2023 05:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689080323; x=1720616323; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jV1GIWokmNHIgBtvVxwWSRd15jG/A88s8g/lUsd9Z1Q=; b=B84CQvdJu23NNGyyGvWbEFdfolI0ZagFPjmPhFxQ2D7c68XhcY/+AY1v CaD5EUadbNtNRAWGX9oVOYBIem8IlIRbziz6P5n+Mn64cTmTXgcLJagCf khSY70GxB1q7jFtjz56KJx1AG14hXQKyepP1EQsPyJJo//goAbHpXHUK4 Yg6dmMsZbuhgvTbec/YYZGO4weKCaGKXiF3yWrOTummQZb0Zme66ZUZMq 2UflnRv3uXJa0/A7vz9YablBzJqU0IATVbHPLP0h32LTR0zn0RFH1kTia b2qJSOj05Z2s+MqpPmp+gHe/rounQxKrGrlo/sne9YeUzifMUT3u5RUFI A==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="367187518" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="367187518" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 05:57:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="834666761" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="834666761" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga002.fm.intel.com with ESMTP; 11 Jul 2023 05:57:32 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Bjorn Helgaas , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , Kai Vehmanen , Andy Shevchenko , Hans de Goede , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Subject: [PATCH 10/13] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Tue, 11 Jul 2023 14:57:23 +0200 Message-Id: <20230711125726.3509391-11-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230711125726.3509391-1-amadeuszx.slawinski@linux.intel.com> References: <20230711125726.3509391-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro, so device ID can be provided in short form. Acked-by: Mark Brown Signed-off-by: Amadeusz S=C5=82awi=C5=84ski --- 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/bo= ard_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 { }; =20 #define AVS_MACH_ENTRY(_id, _mach) \ - { .id =3D (_id), .machs =3D (_mach), } + { .id =3D PCI_DEVICE_ID_INTEL_##_id, .machs =3D (_mach), } =20 /* supported I2S boards per platform */ static const struct avs_acpi_boards i2s_boards[] =3D { - 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), {}, }; =20 --=20 2.34.1