--- /dev/null
+From jonathanh@nvidia.com Sat Jun 7 10:37:42 2025
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Thu, 5 Jun 2025 13:54:32 +0100
+Subject: Revert "cpufreq: tegra186: Share policy per cluster"
+To: <stable@vger.kernel.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>, Aaron Kling <webgeek1234@gmail.com>, <linux-tegra@vger.kernel.org>, Jon Hunter <jonathanh@nvidia.com>
+Message-ID: <20250605125432.357372-1-jonathanh@nvidia.com>
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+This reverts commit d95fdee2253e612216e72f29c65b92ec42d254eb which is
+upstream commit be4ae8c19492cd6d5de61ccb34ffb3f5ede5eec8.
+
+This commit is causing a suspend regression on Tegra186 Jetson TX2 with
+Linux v6.12.y kernels. This is not seen with Linux v6.15 that includes
+this change but indicates that there are there changes missing.
+Therefore, revert this change.
+
+Fixes: d95fdee2253e ("cpufreq: tegra186: Share policy per cluster")
+Link: https://lore.kernel.org/linux-tegra/bf1dabf7-0337-40e9-8b8e-4e93a0ffd4cc@nvidia.com/
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/cpufreq/tegra186-cpufreq.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+--- a/drivers/cpufreq/tegra186-cpufreq.c
++++ b/drivers/cpufreq/tegra186-cpufreq.c
+@@ -73,18 +73,11 @@ static int tegra186_cpufreq_init(struct
+ {
+ struct tegra186_cpufreq_data *data = cpufreq_get_driver_data();
+ unsigned int cluster = data->cpus[policy->cpu].bpmp_cluster_id;
+- u32 cpu;
+
+ policy->freq_table = data->clusters[cluster].table;
+ policy->cpuinfo.transition_latency = 300 * 1000;
+ policy->driver_data = NULL;
+
+- /* set same policy for all cpus in a cluster */
+- for (cpu = 0; cpu < ARRAY_SIZE(tegra186_cpus); cpu++) {
+- if (data->cpus[cpu].bpmp_cluster_id == cluster)
+- cpumask_set_cpu(cpu, policy->cpus);
+- }
+-
+ return 0;
+ }
+