From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7A1CF8F74 for ; Sun, 16 Jul 2023 20:14:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1D6EC433C7; Sun, 16 Jul 2023 20:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689538476; bh=p6M69ZO0XbkZdjNADJARWO8RMiGy2uNYuolHUJzP1w0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CfQhZZGprbU6ryAWoAqE4xI2KIEL6THloGCpkiKU3VLxMpfqqYbpGpMCoCS5oPgYs 4rBDeLmnx2CpJ8ZuYkC8Mpoge7zlXn7KRM8Tj1DVsA4G9NG8ux50xvFY8QicrIXtXu gZ+ZzsnhgsQ8a2Wx8thrVr7Z8e/I1aCSRiwdQ06M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xi Pardee , "David E. Box" , Hans de Goede , Sasha Levin Subject: [PATCH 6.4 457/800] platform/x86:intel/pmc: Remove Meteor Lake S platform support Date: Sun, 16 Jul 2023 21:45:10 +0200 Message-ID: <20230716194959.697793269@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716194949.099592437@linuxfoundation.org> References: <20230716194949.099592437@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Xi Pardee [ Upstream commit 416a87c972b978d71ab828442d1d48e3bd194855 ] commit c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake support to pmc core driver") was supposed to add support for Meter Lake P/M and mistakenly added support for Meteor Lake S instead. Meteor Lake P/M support was added later and MTL-S support needs to be removed since its currently assigned to the wrong register maps. Fixes: c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake support to pmc core driver") Signed-off-by: Xi Pardee Signed-off-by: David E. Box Link: https://lore.kernel.org/r/20230601004706.871528-1-xi.pardee@intel.com Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin --- drivers/platform/x86/intel/pmc/core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index da6e7206d38b5..b8711330e4112 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -1039,7 +1039,6 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, tgl_core_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, adl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, mtl_core_init), X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, mtl_core_init), {} }; -- 2.39.2