Drop arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch b/queue-5.10/arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch
deleted file mode 100644 (file)
index 22484b6..0000000
--- a/queue-5.10/arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ab90cad953d871d104000ace9c68bf13c400e7dd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 27 May 2021 21:29:58 +0200
-Subject: arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work)
-
-From: Konrad Dybcio <konrad.dybcio@somainline.org>
-
-[ Upstream commit 0a275a35ceab07cb622ff212c54d6866e246ac53 ]
-
-Fix the compatible to make the driver probe and tell the
-driver where to look for the "xo" clock to make sure everything
-works.
-
-Then we get a happy (eh, happier) 8996:
-
-somainline-sdcard:/home/konrad# cat /sys/kernel/debug/clk/pwrcl_pll/clk_rate
-1152000000
-
-Don't backport without "arm64: dts: qcom: msm8996: Add CPU opps", as
-the system fails to boot without consumers for these clocks.
-
-Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
-Link: https://lore.kernel.org/r/20210527192958.775434-1-konrad.dybcio@somainline.org
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index fd6ae5464dea..b774d5457328 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -1741,9 +1741,14 @@
-                               };
-                       };
-               };
-+
-               kryocc: clock-controller@6400000 {
--                      compatible = "qcom,apcc-msm8996";
-+                      compatible = "qcom,msm8996-apcc";
-                       reg = <0x06400000 0x90000>;
-+
-+                      clock-names = "xo";
-+                      clocks = <&xo_board>;
-+
-                       #clock-cells = <1>;
-               };
- 
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 8862456bced7d8a04dfac028464215afae95fe5b..57809d707e4be5981b642117d2ff22de8bb3b230 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -33,7 +33,6 @@ arm-dts-omap2-replace-underscores-in-sub-mailbox-nod.patch
 arm64-dts-ti-k3-am654x-j721e-j7200-common-proc-board.patch
 arm-tegra-wm8903-fix-polarity-of-headphones-detectio.patch
 arm-tegra-nexus7-correct-3v3-regulator-gpio-of-pm269.patch
-arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch
 arm64-dts-qcom-sc7180-move-rmtfs-memory-region.patch
 arm-dts-stm32-remove-extra-size-cells-on-dhcom-pdk2.patch
 arm-dts-stm32-fix-touchscreen-node-on-dhcom-pdk2.patch

diff --git a/queue-5.13/arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch b/queue-5.13/arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch
deleted file mode 100644 (file)
index 9a04d5d..0000000
--- a/queue-5.13/arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 90f05a0a6a93a2f261fbd8ab4a93917cf4923a40 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 27 May 2021 21:29:58 +0200
-Subject: arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work)
-
-From: Konrad Dybcio <konrad.dybcio@somainline.org>
-
-[ Upstream commit 0a275a35ceab07cb622ff212c54d6866e246ac53 ]
-
-Fix the compatible to make the driver probe and tell the
-driver where to look for the "xo" clock to make sure everything
-works.
-
-Then we get a happy (eh, happier) 8996:
-
-somainline-sdcard:/home/konrad# cat /sys/kernel/debug/clk/pwrcl_pll/clk_rate
-1152000000
-
-Don't backport without "arm64: dts: qcom: msm8996: Add CPU opps", as
-the system fails to boot without consumers for these clocks.
-
-Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
-Link: https://lore.kernel.org/r/20210527192958.775434-1-konrad.dybcio@somainline.org
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index ce430ba9c118..dd89d3cb772b 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -1745,9 +1745,14 @@
-                               };
-                       };
-               };
-+
-               kryocc: clock-controller@6400000 {
--                      compatible = "qcom,apcc-msm8996";
-+                      compatible = "qcom,msm8996-apcc";
-                       reg = <0x06400000 0x90000>;
-+
-+                      clock-names = "xo";
-+                      clocks = <&xo_board>;
-+
-                       #clock-cells = <1>;
-               };
- 
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index d33c7596691e6ce560b9375890b789811650fe45..7a0bcd373268187ee7cbc53d4b07a88f6f9de7d6 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -44,7 +44,6 @@ arm64-dts-ti-k3-am654x-j721e-j7200-common-proc-board.patch
 arm-tegra-wm8903-fix-polarity-of-headphones-detectio.patch
 arm-tegra-nexus7-correct-3v3-regulator-gpio-of-pm269.patch
 arm64-dts-qcom-sm8350-fix-the-node-unit-addresses.patch
-arm64-dts-qcom-msm8996-make-cpucc-actually-probe-and.patch
 arm64-dts-qcom-sm8250-fix-display-nodes.patch
 arm64-dts-qcom-sc7180-move-rmtfs-memory-region.patch
 arm-dts-stm32-remove-extra-size-cells-on-dhcom-pdk2.patch