drop queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-c.patch

diff --git a/queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-c.patch b/queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-c.patch
deleted file mode 100644 (file)
index ce4c1a8..0000000
--- a/queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-c.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From fd5adcd1f69bb9a5f9d6cb39485cd327f45760c8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 12:32:40 +0530
-Subject: arm64: dts: qcom: sc8280xp-pmics: Remove reg entry & use correct node
- name for pmc8280c_lpg node
-
-From: Bhupesh Sharma <bhupesh.sharma@linaro.org>
-
-[ Upstream commit 7dac7991408f77b0b33ee5e6b729baa683889277 ]
-
-Commit eeca7d46217c ("arm64: dts: qcom: pm8350c: Drop PWM reg declaration")
-dropped PWM reg declaration for pm8350c pwm(s), but there is a leftover
-'reg' entry inside the lpg/pwm node in sc8280xp dts file. Remove the same.
-
-While at it, also remove the unused unit address in the node
-label.
-
-Also, since dt-bindings expect LPG/PWM node name to be "pwm",
-use correct node name as well, to fix the following
-error reported by 'make dtbs_check':
-
-  'lpg' does not match any of the regexes
-
-Fixes: eeca7d46217c ("arm64: dts: qcom: pm8350c: Drop PWM reg declaration")
-Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
-Cc: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
-Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Link: https://lore.kernel.org/r/20220905070240.1634997-1-bhupesh.sharma@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
-index ae90b97aecb8..24836b6b9bbc 100644
---- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
-@@ -60,9 +60,8 @@
-                       #interrupt-cells = <2>;
-               };
- 
--              pmc8280c_lpg: lpg@e800 {
-+              pmc8280c_lpg: pwm {
-                       compatible = "qcom,pm8350c-pwm";
--                      reg = <0xe800>;
- 
-                       #address-cells = <1>;
-                       #size-cells = <0>;
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 54025befc1e366ad2033fe92a266aaff33145c36..acb56eeb883b734fb29f420bb5ade5ef66963b01 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -435,7 +435,6 @@ arm-dts-turris-omnia-fix-mpp26-pin-name-and-comment.patch
 arm-dts-kirkwood-lsxl-fix-serial-line.patch
 arm-dts-kirkwood-lsxl-remove-first-ethernet-port.patch
 arm64-dts-marvell-98dx25xx-use-correct-property-for-.patch
-arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-c.patch
 ia64-export-memory_add_physaddr_to_nid-to-fix-cxl-bu.patch
 arm64-dts-qcom-sm8350-sagami-correct-ts-pin-property.patch
 soc-tegra-fuse-add-missing-of_node_put-in-tegra_init.patch