drop cpuidle-tegra-check-whether-pmc-is-ready.patch from 5.10 and 5.15 queues

diff --git a/queue-5.10/cpuidle-tegra-check-whether-pmc-is-ready.patch b/queue-5.10/cpuidle-tegra-check-whether-pmc-is-ready.patch
deleted file mode 100644 (file)
index d106aa5..0000000
--- a/queue-5.10/cpuidle-tegra-check-whether-pmc-is-ready.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 23c14eacbd57f267e348f8ade7d2e1da53825735 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 12 Sep 2021 23:29:07 +0300
-Subject: cpuidle: tegra: Check whether PMC is ready
-
-From: Dmitry Osipenko <digetx@gmail.com>
-
-[ Upstream commit bdb1ffdad3b73e4d0538098fc02e2ea87a6b27cd ]
-
-Check whether PMC is ready before proceeding with the cpuidle registration.
-This fixes racing with the PMC driver probe order, which results in a
-disabled deepest CC6 idling state if cpuidle driver is probed before the
-PMC.
-
-Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Thierry Reding <treding@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpuidle/cpuidle-tegra.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/cpuidle/cpuidle-tegra.c b/drivers/cpuidle/cpuidle-tegra.c
-index 29c5e83500d33..e6f96d272d240 100644
---- a/drivers/cpuidle/cpuidle-tegra.c
-+++ b/drivers/cpuidle/cpuidle-tegra.c
-@@ -346,6 +346,9 @@ static void tegra_cpuidle_setup_tegra114_c7_state(void)
- 
- static int tegra_cpuidle_probe(struct platform_device *pdev)
- {
-+      if (tegra_pmc_get_suspend_mode() == TEGRA_SUSPEND_NOT_READY)
-+              return -EPROBE_DEFER;
-+
-       /* LP2 could be disabled in device-tree */
-       if (tegra_pmc_get_suspend_mode() < TEGRA_SUSPEND_LP2)
-               tegra_cpuidle_disable_state(TEGRA_CC6);
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 17c3a530e8409d1700558c6229a9184f2a5a4e38..235235e06489326f811db570179d4d600364c41c 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -27,7 +27,6 @@ scsi-advansys-fix-kernel-pointer-leak.patch
 alsa-intel-dsp-config-add-quirk-for-apl-glk-tgl-devi.patch
 asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch
 firmware_loader-fix-pre-allocated-buf-built-in-firmw.patch
-cpuidle-tegra-check-whether-pmc-is-ready.patch
 arm-dts-omap-fix-gpmc-mux-add-data-type.patch
 usb-host-ohci-tmio-check-return-value-after-calling-.patch
 arm-dts-ls1021a-move-thermal-zones-node-out-of-soc.patch

diff --git a/queue-5.15/cpuidle-tegra-check-whether-pmc-is-ready.patch b/queue-5.15/cpuidle-tegra-check-whether-pmc-is-ready.patch
deleted file mode 100644 (file)
index a9f7ac6..0000000
--- a/queue-5.15/cpuidle-tegra-check-whether-pmc-is-ready.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 916d5aca572e4c03d8341600eb237ddaa174d848 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 12 Sep 2021 23:29:07 +0300
-Subject: cpuidle: tegra: Check whether PMC is ready
-
-From: Dmitry Osipenko <digetx@gmail.com>
-
-[ Upstream commit bdb1ffdad3b73e4d0538098fc02e2ea87a6b27cd ]
-
-Check whether PMC is ready before proceeding with the cpuidle registration.
-This fixes racing with the PMC driver probe order, which results in a
-disabled deepest CC6 idling state if cpuidle driver is probed before the
-PMC.
-
-Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Thierry Reding <treding@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpuidle/cpuidle-tegra.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/cpuidle/cpuidle-tegra.c b/drivers/cpuidle/cpuidle-tegra.c
-index 508bd9f237929..9845629aeb6d4 100644
---- a/drivers/cpuidle/cpuidle-tegra.c
-+++ b/drivers/cpuidle/cpuidle-tegra.c
-@@ -337,6 +337,9 @@ static void tegra_cpuidle_setup_tegra114_c7_state(void)
- 
- static int tegra_cpuidle_probe(struct platform_device *pdev)
- {
-+      if (tegra_pmc_get_suspend_mode() == TEGRA_SUSPEND_NOT_READY)
-+              return -EPROBE_DEFER;
-+
-       /* LP2 could be disabled in device-tree */
-       if (tegra_pmc_get_suspend_mode() < TEGRA_SUSPEND_LP2)
-               tegra_cpuidle_disable_state(TEGRA_CC6);
--- 
-2.33.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index a96cf3d6407006829eb165334e359d0e6085c112..d871fd7c55046492f96c4a1c18aac3468ccdcb20 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -46,7 +46,6 @@ alsa-intel-dsp-config-add-quirk-for-apl-glk-tgl-devi.patch
 asoc-intel-soc-acpi-add-missing-quirk-for-tgl-sdca-s.patch
 asoc-intel-sof_sdw-add-missing-quirk-for-dell-sku-0a.patch
 firmware_loader-fix-pre-allocated-buf-built-in-firmw.patch
-cpuidle-tegra-check-whether-pmc-is-ready.patch
 hid-multitouch-disable-sticky-fingers-for-uperfect-y.patch
 alsa-usb-audio-add-support-for-the-pioneer-djm-750mk.patch
 arm-dts-omap-fix-gpmc-mux-add-data-type.patch