From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Oct 2022 12:09:22 +0000 (+0200)
Subject: 6.0-stable patches
X-Git-Tag: v6.0.3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35161af6ef20cadca1c057a40076de7cf875a7a1;p=thirdparty%2Fkernel%2Fstable-queue.git

6.0-stable patches

added patches:
	arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-correct-node-name-for-pmc8280c_lpg-node.patch
---

diff --git a/queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-correct-node-name-for-pmc8280c_lpg-node.patch b/queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-correct-node-name-for-pmc8280c_lpg-node.patch
new file mode 100644
index 00000000000..b211164f07d
--- /dev/null
+++ b/queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-correct-node-name-for-pmc8280c_lpg-node.patch
@@ -0,0 +1,49 @@
+From 7dac7991408f77b0b33ee5e6b729baa683889277 Mon Sep 17 00:00:00 2001
+From: Bhupesh Sharma <bhupesh.sharma@linaro.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>
+
+commit 7dac7991408f77b0b33ee5e6b729baa683889277 upstream.
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- 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>;
diff --git a/queue-6.0/series b/queue-6.0/series
index 9724780b05e..a3783753fbe 100644
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -850,3 +850,4 @@ io_uring-rw-ensure-kiocb_end_write-is-always-called.patch
 kconfig.debug-simplify-the-dependency-of-debug_info_dwarf4-5.patch
 kconfig.debug-add-toolchain-checks-for-debug_info_dwarf_toolchain_default.patch
 lib-kconfig.debug-add-check-for-non-constant-.-s-u-leb128-support-to-dwarf5.patch
+arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-correct-node-name-for-pmc8280c_lpg-node.patch