From patchwork Wed Jun 28 20:51:32 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: 113860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8916350vqr; Wed, 28 Jun 2023 06:14:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7IKLkOgnKurzPuziUmycroK52sUzutFqWQd/SIPYJonv8W9z5Oj3SkRVrGzejLXKKbLazP X-Received: by 2002:a17:90a:641:b0:263:3567:f99 with SMTP id q1-20020a17090a064100b0026335670f99mr1683060pje.15.1687958064888; Wed, 28 Jun 2023 06:14:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687958064; cv=none; d=google.com; s=arc-20160816; b=c/2tPxhYewjRzJ47X21D0QQ7AYin3cx4UMW+U2PtHWUcM0E7mFG5v6SgBGSm4lHgJ/ Sz9+zkDaOOn4KBT52/X1VLtmcGZ6hZHoTDN9x2DfH1s9rsHTM3KGQ6qIIAwPLGoBAYR5 2tOYO+VFMfsaVmOcRVejYSqib7BrpD1PY3ZMXHcEx+zg7BV1EC1/5rJhLFT8yz9ckgwL NW/DmeL0HZTwhmrLfByRjtToMxAjyI7v0Q0RoOtvHTc7RRzWv3WdkdW4AVhw8fC2WTKa Li54ka2Z4gz3WMMEfP9atYq3LBtBiUQa2wSrxK0Ws8CnjmT6v9gjEN9vlmhn4LHI3Hew ie2w== 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=la58MI6+hhFkITR60ITu80D6fRAg3gMWDP8v7vQ8Sr4=; fh=4hmkLMGNpQ+PocmVypGauCnPZxjmrElQ8gsuUAuM8xE=; b=RVxKJ2+gM8uFfXTfT1ww4PCqOZfR2zAgx0ldAjD2BTfR0mP1aSKjCuhc051hshxya+ N9tVyMmBV5PfsqYZ/37flLaP8TsoN//R52maauvfHQAJmv1iLlgtt7/lUi0+iw85ZZDy Kn4uT8DwsCE7vy9w4PCTUFQVnjfVJDrVzzvrBZHbiDq9tMBsH+kYuzmcojzyhFnkfPZq oQIZ9KMIj9sgOWl4VLdQBDeOyQk6K/qlyhItx1JvKJnR4kplZIZT6ryaB+qjmeqZ2pzH pqk86L7ESyF8hOCqxU6dg7i1EDcpZMu9huPYCkS2Xg2w8BDZH1xkxAJEeDSiWs5FDcuD mcJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="STmJz/3X"; 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 b6-20020a170903228600b001b3bda067dasi8383219plh.493.2023.06.28.06.14.11; Wed, 28 Jun 2023 06:14:24 -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="STmJz/3X"; 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 S231579AbjF1MvG (ORCPT + 99 others); Wed, 28 Jun 2023 08:51:06 -0400 Received: from mga14.intel.com ([192.55.52.115]:59121 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230446AbjF1Mup (ORCPT ); Wed, 28 Jun 2023 08:50:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687956645; x=1719492645; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3AVsoshV580ox4TPHPVqbeF3N9M1fkfqjuyCWEE/4H0=; b=STmJz/3XUA9gPLr+OWerudVAvlSI76RWZ3XmMF/YRxXjDYlCl/UB8Yy5 KAcYEbwriYvUINuP35c1LD/qRGnu6hpQx2MQjcOkisjnHThZ+QF7FRlei WQfAZqwJTedfpSIL9y/1rs0dovHeHF6pnAGQQPcSFA6B24Q8ncMUuU+lc WmlsOnBqLfiW5dszsckN35K+da4viS1IRi6e5xUDApI/oN+/U0TSrOws3 GrGoj6kSoQmqG2ciFxRc0DaslWa1FPeSNYIvGVKql6AmfojUgSrwNkBLS wo6TDxGO1t1ID9fmNV8Cr+JlGUs0Hs2aBb+5S4Fk5obSAcW9vy/+0KxdQ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10754"; a="361875588" X-IronPort-AV: E=Sophos;i="6.01,165,1684825200"; d="scan'208";a="361875588" 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:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10754"; a="891035106" X-IronPort-AV: E=Sophos;i="6.01,165,1684825200"; d="scan'208";a="891035106" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga005.jf.intel.com with ESMTP; 28 Jun 2023 05:50:31 -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 5/8] ASoC: Intel: avs: Update PCI ID list Date: Wed, 28 Jun 2023 22:51:32 +0200 Message-Id: <20230628205135.517241-6-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?1769952315952971222?= Use PCI device IDs from pci_ids.h header and while at it change to using PCI_DEVICE_DATA macro, to simplify declarations. Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index 637501850728..2ba179e31e43 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -745,14 +745,14 @@ static const struct avs_spec apl_desc = { }; static const struct pci_device_id avs_ids[] = { - { PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */ - { PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */ - { PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */ - { PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */ - { PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */ - { PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */ - { PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */ - { PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */ + { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_KBL, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) }, { 0 } }; MODULE_DEVICE_TABLE(pci, avs_ids);