From patchwork Mon Jul 17 11:45:08 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: 121250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1076030vqt; Mon, 17 Jul 2023 05:24:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFe4jSyYncB7S5tY/uqAS6RcvcT2OyKmMaiIXjEy668aga5HviI/FAdtYxaqPUs3LLiNLJ1 X-Received: by 2002:a05:6512:3c90:b0:4f1:3d7d:409e with SMTP id h16-20020a0565123c9000b004f13d7d409emr9901602lfv.0.1689596681696; Mon, 17 Jul 2023 05:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689596681; cv=none; d=google.com; s=arc-20160816; b=umXorUvYMniMscdbS22ydLW78pDdVkSLEms+eXmndEeLCv55W04HedcBaa5VikkuhV uT7HX5RAMHKF9MmgLpeCymNcffoBmw84yudrbWd1QTZD72QfRiQqWltD2Jvdyi4CzcXZ S6jRVJyqSnSLG9H2OrRzu3+TXZtQmn6/e6E+yUnZqjoYbV44BJiVOAUerBsT8fE4EADU QPtko+kg85NqO0dbZa2TZCiUuQ/AYAGAy+ajtuWgkOCnYlM2Xcm8J01U2xB14YhnjeHz AV/slWWv7XDp5cto2kdiIocR3WLmy8cBEdheocmpGnluCcfjhYtDi1QuwL6pApOvJTY8 TKcw== 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=MO9qvTx2/SDIe5IpGwaKAP3nojp5VP1dZIdNBF9V0P8=; fh=WYMxSBIzRoGpjokqDjpNyzs/ox+ow6sUuRoGJdpn/uA=; b=CX0z0nviNzoYLajiPQnJ+y6UnWAhupSJUC1A30xeIQ7PkIQj0Mx5Bw5M9CjRi3WBif uyObxkjNpKBq+N1fMatZHZxMvFx/drGq4SjiJnbInr2orb46NhiQsV+VYRqvshCdrfN0 +B2GSqRjhBBaHkr8Cfws8U4Vm5pQxX4KTal67cHClPP/fYQ7AKmIJON+iEvzUvCuuEap fv0xMV9THclpnwh2KFlJnwsls4BB9FYmitj3dxcj6N6uT1noqkf4XsXE6XbAraojxTPj kfcZ9HExVRi077f+Isl27aVRBaFKfAhF2cLOEuiD5WXQxJ7v6UG+Ay1L2kHjMFJK5EfM /O+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kl4Rwt+9; 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 f25-20020a056402151900b0051e4728e759si13811708edw.520.2023.07.17.05.24.17; Mon, 17 Jul 2023 05:24:41 -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=kl4Rwt+9; 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 S230355AbjGQLsk (ORCPT + 99 others); Mon, 17 Jul 2023 07:48:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230371AbjGQLs3 (ORCPT ); Mon, 17 Jul 2023 07:48:29 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5069010E4; Mon, 17 Jul 2023 04:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689594488; x=1721130488; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0AXpV0FjivTzBstr/PQwlZnSEFZXSw8dA2CnQf5ffBE=; b=kl4Rwt+9asuqCkea8AJaVFf7hdX/RdMABHGdaUObweDLpmOMdo8qQzD4 bCf6Qx/NwKa/JFO+Xz72OigGgzcvmMEerXTgK0PHrtP4NG3n259Ls54ti gUr8k/H9nnTZBBOOYsGFnD2bTO9pHHB6QvrMShqE8KyP+E7vz3kGKfBUu pV5IKfJRIk79sM23NxSTUY1ETxDBKn6/MLDjKsaoB+/lpcAFUWvcqVA/z HTV6+WwbIQRwtFSAlp6QDMAhLfA9I51HTNMqdF9xEAx7fybVzOf7okzeG 8BmjrNCAuQEu+JwIrXglvAZk5AodZBbdkjqMbBEM23o+D0CEW97N98tpr Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="363372970" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="363372970" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 04:46:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="969856544" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="969856544" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga006.fm.intel.com with ESMTP; 17 Jul 2023 04:45:58 -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 , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= , Andy Shevchenko Subject: [PATCH v4 12/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Mon, 17 Jul 2023 13:45:08 +0200 Message-Id: <20230717114511.484999-13-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230717114511.484999-1-amadeuszx.slawinski@linux.intel.com> References: <20230717114511.484999-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: 1771670529640661781 X-GMAIL-MSGID: 1771670529640661781 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 Reviewed-by: Cezary Rojewski 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), {}, };