From patchwork Wed May 29 19:14:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tony Luck X-Patchwork-Id: 13679429 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E075F8BFF; Wed, 29 May 2024 19:14:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717010099; cv=none; b=ME1r8ijcyB8rytoYBym/5GsjgATnZxRzt7FtIB6bPdpqg4WVALZEf3BbzcHhP7hQEIBXFwOOTSfdqKWfODW8REvIH7rQbJQihqJgV1nLmwDftuduAJrV28fuqvLEtTRCmUaYI6CUwsMGtT8IKS32hjGyFdnYjaUEhwVBTadQyjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717010099; c=relaxed/simple; bh=2WGXBVBs50TNH9MqDPwVlbQd0d4cA9xeNLapku5f+C0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=niUBT5ZgfhtNodLnt3iITYoT1+gUP52WCu0I7C5tjvyiam4z2bC01UHSMoGEOJF8t3IlUmrSkxz5O7hMFu9sTyHfxJvUmTnkNO/fdM7HCrBT7ticObUss6XMyxFLBDorUQKfObl7mb4Twx3xAkyFjKm/1ygLIDSJmbpcOLJ5590= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=O+rBExm7; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="O+rBExm7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717010099; x=1748546099; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=2WGXBVBs50TNH9MqDPwVlbQd0d4cA9xeNLapku5f+C0=; b=O+rBExm76XbfZ1yzdp/rS4+DPJXckBoL8e0NadWGgErc1VRUl3kGy8z5 WgPtxBZwj+pULWU5KQmOVDjBB5oTRXejXXTPoIlwPamh/9N7wguqEOSak HO8R7Y624fQXQ5QbQSKaaI4b+wu4/JCp/KTxCCXqunZ91zRXOxz1h3vME yOrWMl5QqFQjR+w2HCWbya9CD0WFg04hao25d1J8CRaSxXmi661sxAu3T C2C+/0tZFhf0sciS1mWSx3DzS0zHoE5GKZ9EmKZNgvDivFKBjVU6LI+Vw x8h5wsOtPXYKGu0vCQX+pxY3C9k080085tAcoEcxf4Ajm19efTtNntnvP A==; X-CSE-ConnectionGUID: OSjcfNuvQC+NeAJcWU3MTQ== X-CSE-MsgGUID: 7Zk75Q1hRFKlmRVGCtCBOg== X-IronPort-AV: E=McAfee;i="6600,9927,11087"; a="13212837" X-IronPort-AV: E=Sophos;i="6.08,199,1712646000"; d="scan'208";a="13212837" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2024 12:14:58 -0700 X-CSE-ConnectionGUID: 5QmcUxzmRzeRqcynh9Mk7A== X-CSE-MsgGUID: IvecUSxRQ6eNjXYrbi8Qww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,199,1712646000"; d="scan'208";a="36163263" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2024 12:14:57 -0700 From: Tony Luck To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH v6 06/49] ASoC: Intel: avs: es8336: Switch to new Intel CPU model defines Date: Wed, 29 May 2024 12:14:50 -0700 Message-ID: <20240529191450.63414-1-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Reviewed-by: Amadeusz Sławiński Acked-by: Mark Brown --- 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 3bf37a8fd6e6..c8522e2430f8 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: