From patchwork Fri Jul 14 20:24:54 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: 120460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2475325vqm; Fri, 14 Jul 2023 05:41:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlHGJfhojfzwmFfS+13GWdzEix/fS/BEservtz6jGvLL5h5MktlsTlegI+uh3oAMlj2c/r5Z X-Received: by 2002:a54:4f06:0:b0:3a4:3132:2a9d with SMTP id e6-20020a544f06000000b003a431322a9dmr4692300oiy.19.1689338490878; Fri, 14 Jul 2023 05:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689338490; cv=none; d=google.com; s=arc-20160816; b=gEILWmvwi4w27GZ0WYTqGls68O06c8jBOav7vGe/Isv3JBmEmkKWIxFm4CtwIIvuiM yaK6RQ5RJ1VGacrpHJGnoSeCwR5ako8/G2D4YCIgAIyOxV7DiwlEB7NfLFS+dz0ySIBu 9akKULpuV7B/AosuUFJC8tO0zySZK+shfjoTW4Yr2R/6LXOTjiRrXYAXWvPdrW6W5Vu8 WsLYuuZnXJdUwTsGC5svD1U7cqAqxaz2vQvm5+aLUgvkEiBHPB3IEiuIoAPINfbSh0P1 rtkBjyx4Rr5Lz/GPrqY3BJoCAyGIWsnCn+6CtnyhsrD9CaTsLu4Iro8yM7gfNn7yZfsF EyyA== 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=tNxCgN30UBp2FvHBMJAqjdJED/dVzUmy/wCV5ppXwLRf8HXw9xWuk2C1FEe66E3aAA 0cdrVrLa5xHO80otYF/HMI70jy1WtRJdIoUhYJr8Ae7Roiav5EKKwYdKyKkuVwP1kHxJ DhyKEYhWzwGWzHsojn2eTL7Zh7IMLJeZoDoOwXH0bqL+x8JHgvsS5RttRqpYj6j27PeS d3Nc+ezY8l+Y5ajoWQ6Ns9Cg/wMkIWGQFC6RPNNG5ztdv7q4Wlj5M7wO87ij/M7y6+Y5 toL4OBah6Bnwm7aF5UGnI7Z/8ZLZAagkslKQb20C7tc+M43xe6YROAl44BQqoE+wBOKc 384w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=azMC253o; 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 r13-20020a65508d000000b00530b3b98fc5si1948239pgp.417.2023.07.14.05.41.18; Fri, 14 Jul 2023 05:41:30 -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=azMC253o; 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 S235921AbjGNMZ0 (ORCPT + 99 others); Fri, 14 Jul 2023 08:25:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235918AbjGNMY7 (ORCPT ); Fri, 14 Jul 2023 08:24:59 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BFFC359F; Fri, 14 Jul 2023 05:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689337468; x=1720873468; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gt1bM8Q/FD2VIOVF2wWpS3Dslq5MDz04LTOzsoLpYFY=; b=azMC253ohZwuKkg8WIcpPXOVObZcLEraHpHantczpQA1C++KMhIpN+ib C8+4NDTPJF5A3TpcH8Xout6h8nWiuxM6xWeDfaLwCy3lzLy1nsDsHHa0T saRQuSGD2Tl0riRqM0Bb0Ib5dg9SevJNPWZ3REY6vjHX+cc/l+g8icghg wq8b6FbD5UhWxNDa9eyNzBcQoYV1IdybnM5fO9vz1mNdVp49XMWYNQ+HO 518LJFpzNJInNnzGS4NDAcC4cr5qJlvKZWRNYmyeZ7X47enSnEInskmUf fbmGEPFxmRKdvsDHFmrHZnmczY2C01JuT4QZVvSbqQHKcuMbXdpz+oO+q A==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="429225894" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="429225894" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 05:24:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="1053034989" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="1053034989" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga005.fm.intel.com with ESMTP; 14 Jul 2023 05:24:14 -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?= , Andy Shevchenko Subject: [PATCH v3 12/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Fri, 14 Jul 2023 22:24:54 +0200 Message-Id: <20230714202457.423866-13-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> References: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771399796981905387 X-GMAIL-MSGID: 1771399796981905387 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 Reviewed-by: Andy Shevchenko Signed-off-by: Amadeusz Sławiński --- 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), {}, };