From patchwork Wed Jun 28 20:51:33 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: 113853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8908324vqr; Wed, 28 Jun 2023 06:04:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7EEPrOtyagqi5Fd3mwgGgceWzWDWSFyLYuOpb8seSKRd4UAKyFSXFHF9lDnMGthnRHzmip X-Received: by 2002:a17:906:dac4:b0:974:5399:c21 with SMTP id xi4-20020a170906dac400b0097453990c21mr28066177ejb.24.1687957486829; Wed, 28 Jun 2023 06:04:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687957486; cv=none; d=google.com; s=arc-20160816; b=vT9HPCoAHpH1Q4LTFt9pavXa9n4WTqiSDbJSiLyxOhUkUm/ckmgxY1VHVj80mJCsuQ U5DuJraga+Jyf+fsuSKOnZITL8nduQWsFi8NcU8v+T9Im60fjbz0sDu9SUWNCPknrjwk Jc2PrjLHzV+Ybcq1xda15x45eT/h496GbJi8KUEdLgp7rzyPg+C2bWZN7oFfkWRqpx4J q2qzsoCriOppXioxKNpGlJNTErFkqCobVQIxFqVLzC7sv4OX8QF6QrcSdArUxmf2iBAF 4LovF9geFuS1Hu++zZTSw9JotjsiIjxTc/EFisMb/OZPFZAsv9Iw80szJ1CGwoRQPRCN Oi9w== 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=9mIBVhBql/SOViHDucpTEK2apCAJP8kDbmda+Q22h3M=; fh=4hmkLMGNpQ+PocmVypGauCnPZxjmrElQ8gsuUAuM8xE=; b=M1YbEO/NkzanvHaCv3HZLUcBT+sRx3RELbDOY/EjcB8Ux9Fe1HCvpb+vIWjStWw53M 4UNZac+Js3FqPGBb7E7fDONFEvBUd/nAuCGOZXBp5yzPibn9YzTDKSi+Nd53PUOouCMs EL9kw2vxevzx+QiDvZEWmHKPTr3eocAukfOBbVAU7pdYWg9WxdHMUIRgbpxys2gzwrZl 4kgPVQ2hp60KCCF+7y6Qq7MEEMhnVXedkayP6gD7F3CChjbdNp0OxZaGAQKlucn1N8up SMkOXldfFdxw4Q96Olt/NjK/8sYPkCdnaoRLJC5kRBQrZ7qULcS4xwZs6D6Ri0qlkW4w 6lLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aOAFar0L; 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 cw11-20020a170906c78b00b0098779e34f8bsi5249003ejb.787.2023.06.28.06.04.20; Wed, 28 Jun 2023 06:04:46 -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=aOAFar0L; 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 S231835AbjF1MvN (ORCPT + 99 others); Wed, 28 Jun 2023 08:51:13 -0400 Received: from mga14.intel.com ([192.55.52.115]:59110 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbjF1Mur (ORCPT ); Wed, 28 Jun 2023 08:50:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687956647; x=1719492647; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zsrEFmYJgsJtMrAjtYSetFWnmu1Q7S8gVoYkzK5EYQs=; b=aOAFar0LgzODOT81vxFKUol4ikycGYfnwavr3rm3u+K6AdWH4RxuavgJ A3jGQKjYwxyQ8hWhoB6kS/6Xa+uvSDVS9ZSyBXJDvNx2ZZhUIGmq1zBLM wjhcM18u8H4NcOm3/zSFyWpprOaTRH3wemJeeRIuhoZXaZ4KMDqaGgxID n859vENaMWhqBSXElGv770Zjhx4+1yGU45cTvRlhJLZjSvAr4aBo9+XAj pfooug8yI2aFR0FdONIrn6vLURWfdvZtn7SqdE44/TDHeeApWcUUr7uwS NYwNLtiT56iqOkJHaGpN3zhplKez7ZA1Yef/B/VHoYHahprhh1TXk9eSy w==; X-IronPort-AV: E=McAfee;i="6600,9927,10754"; a="361875597" X-IronPort-AV: E=Sophos;i="6.01,165,1684825200"; d="scan'208";a="361875597" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2023 05:50:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10754"; a="891035117" X-IronPort-AV: E=Sophos;i="6.01,165,1684825200"; d="scan'208";a="891035117" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga005.jf.intel.com with ESMTP; 28 Jun 2023 05:50:34 -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?Amadeusz_S=C5=82aw?= =?utf-8?q?i=C5=84ski?= Subject: [RFC PATCH 6/8] ASoC: Intel: avs: Update PCI ID list Date: Wed, 28 Jun 2023 22:51:33 +0200 Message-Id: <20230628205135.517241-7-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230628205135.517241-1-amadeuszx.slawinski@linux.intel.com> References: <20230628205135.517241-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769951709520531516?= X-GMAIL-MSGID: =?utf-8?q?1769951709520531516?= Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY macro, so device id can be provided in short form. 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..b2d17124c978 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_HDA_##_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(SKL_LP, avs_skl_i2s_machines), + AVS_MACH_ENTRY(KBL_LP, avs_kbl_i2s_machines), + AVS_MACH_ENTRY(APL, avs_apl_i2s_machines), + AVS_MACH_ENTRY(GML, avs_gml_i2s_machines), {}, };