From patchwork Tue Jul 11 12:57:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 13308706 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D26E4EB64DC for ; Tue, 11 Jul 2023 13:00:40 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CE5BA7F4; Tue, 11 Jul 2023 14:59:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CE5BA7F4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1689080438; bh=jV1GIWokmNHIgBtvVxwWSRd15jG/A88s8g/lUsd9Z1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=a1DR5CsbGG4xpM6TmHeY2ji1l5Bjcl5CxHgwY21xiDO8w3YeYf0YHV0qDDbSrGtwv 1juzU5YqqQPF7c5Wkymq73Rky3raQ+vqftkicDkblNXNs99cm8fjWO3feg80duP8WP OVpHV7/EtRjG8+j3WLvZ0gUhw7Yi/0KYn/Wc97Lo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D3CADF80544; Tue, 11 Jul 2023 14:57:53 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 140D3F805D5; Tue, 11 Jul 2023 14:57:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 92E29F805C6; Tue, 11 Jul 2023 14:57:48 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AE92DF80578 for ; Tue, 11 Jul 2023 14:57:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AE92DF80578 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=JwxRf2Y4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689080258; x=1720616258; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jV1GIWokmNHIgBtvVxwWSRd15jG/A88s8g/lUsd9Z1Q=; b=JwxRf2Y4Y6UnDLWJf+XvdjcCtLnr7fmFOesy2AEnzx9DEaWJNxYdzt0u ktc2Ca/YgBYrBlvzZ9dp3/+IQdeJLukEEvU+CZgK1vx8wikb4PDdJGBHT yrHKM6p4wz0lOJ7yYyVM5Ln/MESfG7DR9TeUhzRUTa1FWUDmYP27tzmZ7 SCim6Tbm/upCM8IUpq86qD7xO6GUYPcUywWv6hgvxhSnsH1vp9vLWEdnn nZEAhfxpXYUBauudiL9FuW96jnhTYOAQzFk2mH7VZtH0LvHfbysAiBesm HsvKXylkxb8JCtbWduiXFdbwHbydBkEA8dymOhzlg2wGStNLkQrKSJJCk Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="367187520" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="367187520" 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_S=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_S=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 Message-ID-Hash: QY6LNWV7W2CKGJXV4YMR2TOFLJEX6SA7 X-Message-ID-Hash: QY6LNWV7W2CKGJXV4YMR2TOFLJEX6SA7 X-MailFrom: amadeuszx.slawinski@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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ławiński Reviewed-by: Andy Shevchenko --- 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), {}, };