From: Greg Kroah-Hartman Date: Wed, 19 Oct 2022 15:58:52 +0000 (+0200) Subject: drop queue-6.0/arm64-dts-qcom-sc8280xp-pmics-remove-reg-entry-use-c.patch X-Git-Tag: v6.0.3~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c550dfd067ad2b8a3972c274355b02945c912de;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index ce4c1a86bc2..00000000000 --- 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 -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 - -[ 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 -Cc: Bryan O'Donoghue -Cc: Bjorn Andersson -Signed-off-by: Bhupesh Sharma -Reviewed-by: Bryan O'Donoghue -Reviewed-by: Krzysztof Kozlowski -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220905070240.1634997-1-bhupesh.sharma@linaro.org -Signed-off-by: Sasha Levin ---- - 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 54025befc1e..acb56eeb883 100644 --- 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