From patchwork Wed Apr 24 18:15:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Luck X-Patchwork-Id: 791618 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E618CC10F15 for ; Wed, 24 Apr 2024 18:20:14 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 90B37843; Wed, 24 Apr 2024 20:20:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 90B37843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1713982811; bh=O/JDw8NfkaF9jcVHcgdlz6maAm+xtjFyjDd9Vr0iZSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=o5lzoQepglWPlfaKpfm0tTfL8CaxXWkVBUj0YWaktE/A+YxdTfSOTiw9gVuTu+lMo rLdOaOJmfVf7C1lFMIB1Qc/dIdIsZcU7LQoy+MHKHAcJly3QpXMwFHZJgWtqz+PtiP UiIbGISzsQjgRxSZtOkME4BvD9h7NU+kwCM3K3Zk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C8AA6F80580; Wed, 24 Apr 2024 20:19:38 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 242C6F805A8; Wed, 24 Apr 2024 20:19:38 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BE20CF80423; Wed, 24 Apr 2024 20:16:03 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 259B9F800B5 for ; Wed, 24 Apr 2024 20:15:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 259B9F800B5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=inb+s/8P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982557; x=1745518557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O/JDw8NfkaF9jcVHcgdlz6maAm+xtjFyjDd9Vr0iZSM=; b=inb+s/8PzE5tt8Xe1/CC6ghLNX8XQuWq0igpbzBSao3b5yXW8Y5b7p2G 6/0eFdjsfczAo+SVSFMXoPHzqwDnyEX1Rbgb1aHsVc1PsKXp2UsqrP2TD J8ANSJyUVIl0nHbYEYxBRLtqoLHT3u2isZI3NCDUoW+6EqWr9EutqR+Pl NbO1R20y0FnUBMTSV2C5Tx0DYFCJwbjtLGYfk1FMzZq7D+lllLqtZ2J6k n/fcTCnp90CeGSOyp+K5bcbXxCDVz2yewFgpsq4KtVQ9GoE6omJG/9dW+ Z0qiaumJt0O/WWdjfLYfgB1Df7Nkhwh0RgjYGcGaqm9MkqKwko2VxelIK w==; X-CSE-ConnectionGUID: XxiKGRRjTB60YjJPa6YW9g== X-CSE-MsgGUID: tpWCiArbRTSKSh05F4oHjw== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9756056" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9756056" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:51 -0700 X-CSE-ConnectionGUID: T9nCikZuQKGmObTt2tD5Xw== X-CSE-MsgGUID: DLFKgAyLRaOzpNGLtJ2BRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="24751186" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:51 -0700 From: Tony Luck To: Borislav Petkov , Jaroslav Kysela , Takashi Iwai Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= , Krzysztof Kozlowski , Kuninori Morimoto , Tony Luck , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v4 68/71] ASoC: Intel: avs: es8336: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:50 -0700 Message-ID: <20240424181550.42466-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> MIME-Version: 1.0 Message-ID-Hash: RGXVS2HBLCKOOVE7IBRASEWZCHQNNS73 X-Message-ID-Hash: RGXVS2HBLCKOOVE7IBRASEWZCHQNNS73 X-MailFrom: tony.luck@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- sound/soc/intel/avs/boards/es8336.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 5c90a6007577..3d5d4685a668 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "../utils.h" #define ES8336_CODEC_DAI "ES8316 HiFi" @@ -153,9 +153,9 @@ static int avs_es8336_hw_params(struct snd_pcm_substream *substream, int clk_freq; int ret; - switch (boot_cpu_data.x86_model) { - case INTEL_FAM6_KABYLAKE_L: - case INTEL_FAM6_KABYLAKE: + switch (boot_cpu_data.x86_vfm) { + case INTEL_KABYLAKE_L: + case INTEL_KABYLAKE: clk_freq = 24000000; break; default: