Message ID | 20230714185615.370597-13-amadeuszx.slawinski@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2428518vqm; Fri, 14 Jul 2023 04:16:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlFUgahXnBTn+SWpPJ5XsZ2V0R4Cu0JHAWHDBYJU0aaoUVbGk9XEfIBQyOKdmudbK0lq0TMT X-Received: by 2002:a05:6a20:3258:b0:116:d935:f742 with SMTP id hm24-20020a056a20325800b00116d935f742mr3746671pzc.20.1689333404123; Fri, 14 Jul 2023 04:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689333404; cv=none; d=google.com; s=arc-20160816; b=KbTlAnjowTf367PiZH5j33zoJd6gY+Fu+wFkE+xChkGgNwVtfuYMCKDbbVIdRjAtl5 B5KXY+TpSzXOTDsIWauOmnUbmvO07FfrYCr7FRGouEmxIUMHLOxt7ExyD6Vvzw3KEtB4 BEV9JD8r0bDEq99hsusOuW1yJ5+EQMeuf5ldK3GdBwyC/ZrV07JxTHBViJIO96SKS5Tm zrPkWWhDEOxSZt4pyH8/Bf318z5YZiAJ3CA3uvCjoF+BhZf9KPiiTzdXkLAbDuYFi6gZ WoRvaTB+QN29qJB2jVJ00M/u2ceDeJmSGg5DbkWG1iqHauDCVmBygB9rIzSCV6hEck8y +TBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sMWthKr2GjaGHlLWBOzCX9J1EXDLeTqd//+CO2VbAuo=; fh=iLu8mJV3L09dzJN6VXkKj+SRT/C9p8fR4gJYErWu4bc=; b=ebTW8rxaxgHk26+adpedNcy0v2cJoOh2EDHyAts8X4HjFub33XewIz6xrlA4qL832W +TRDarNZOHBmwl3AYPVPPkQSCSO1cM4ALhvOeNzejeqeyXX7WPCdJ89FQqs7iQJ/xOXv 4gvbVcnmrojlElnQXBis36gdR5nFmigftNU6CT4lXDyTLE1lZZXrYJLBSF8lhDN0UNV4 aBAycNqIxoekhfuUT6lTLC+2Ba6DqWTEnO8LKpYSDYEi/f1I9A0M4hzGAd9tIFLGaKFr 51bHGRrHV+yFFIMYxXKmPG7oB4xncX/yUoZ+uCaczuhjzr1txeeIHm7muWe94YwI2jFF mOjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=liq+fI10; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id br14-20020a056a00440e00b0066879f2c3c8si6956058pfb.244.2023.07.14.04.16.29; Fri, 14 Jul 2023 04:16:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=liq+fI10; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236311AbjGNK4U (ORCPT <rfc822;tebrre53rla2o@gmail.com> + 99 others); Fri, 14 Jul 2023 06:56:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236303AbjGNKzp (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 14 Jul 2023 06:55:45 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC7D835B5; Fri, 14 Jul 2023 03:55:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689332139; x=1720868139; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gt1bM8Q/FD2VIOVF2wWpS3Dslq5MDz04LTOzsoLpYFY=; b=liq+fI10gHXRnSzhvEU6uYGSez5ZanjRb5VUP+QS+gzEdXVqnaHW6Wgb VdCHCWYiFfDRoefoDTQ4fLSrl4V91RL96pQyE4N2bM87hAerjcgE3SwQX GU0DeM2ounT8ltd1biFiQK9AL0ZiHpl/IsOD5YaReYIeQkdyckiWjrwvm nyUGBBPlWYLw+7X6d14yGjAyXk3YreBDhtI8Ivatjt0OWml/xFidy09CB K+Ojs/CwnV9QL6mCLv2gR3FvtKsMtKbyv3y+xkkbBElSIAos1qqWqWQBG KjcLUxmr95xcVsxM0MbYhL+LoAFUqUs4LdCZkTvbUwYV8h5z20e0rhO2Q w==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="364321237" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="364321237" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 03:55:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="722365600" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="722365600" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga002.jf.intel.com with ESMTP; 14 Jul 2023 03:55:36 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com> To: Bjorn Helgaas <bhelgaas@google.com>, Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Kai Vehmanen <kai.vehmanen@linux.intel.com>, Andy Shevchenko <andriy.shevchenko@intel.com>, Hans de Goede <hdegoede@redhat.com>, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com> Subject: [PATCH v2 12/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Fri, 14 Jul 2023 20:56:12 +0200 Message-Id: <20230714185615.370597-13-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714185615.370597-1-amadeuszx.slawinski@linux.intel.com> References: <20230714185615.370597-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771394463078298636 X-GMAIL-MSGID: 1771394463078298636 |
Series |
PCI: Define Intel PCI IDs and use them in drivers
|
|
Commit Message
Amadeusz Sławiński
July 14, 2023, 6:56 p.m. UTC
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 <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/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), {}, };