From: Sasha Levin Date: Mon, 2 Mar 2026 00:44:19 +0000 (-0500) Subject: Drop sdm845-oneplus panel regulator patch from <=6.12 trees X-Git-Tag: v6.19.6~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67992d17d0de7eef7b8496d676e7afb90510b791;p=thirdparty%2Fkernel%2Fstable-queue.git Drop sdm845-oneplus panel regulator patch from <=6.12 trees Drop "arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always on" from queue-5.15, queue-6.1, queue-6.6, and queue-6.12. Co-Authored-By: Claude Opus 4.6 --- diff --git a/queue-5.15/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch b/queue-5.15/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch deleted file mode 100644 index 95f66306e8..0000000000 --- a/queue-5.15/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6a5dadf3fa140f18328bb27518cb04e3ed9f2852 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 18 Nov 2025 15:52:26 +0100 -Subject: arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always - on - -From: Casey Connolly - -[ Upstream commit 45d1f42d3e84b5880cf9fab1eb24a7818320eeb7 ] - -The panel regulator doesn't need to be always on, so remove this -property. - -Fixes: 288ef8a42612 ("arm64: dts: sdm845: add oneplus6/6t devices") -Signed-off-by: Casey Connolly -Signed-off-by: David Heidelberg -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20251118-dts-oneplus-regulators-v2-2-3e67cea1e4e7@ixit.cz -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -index 66b86dd292c8a..1a1e344f870ef 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -@@ -232,7 +232,6 @@ vreg_l14a_1p88: ldo14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-initial-mode = ; -- regulator-always-on; - }; - - vreg_l17a_1p3: ldo17 { --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 256a8ff07e..4386e69ba3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -34,7 +34,6 @@ clk-qcom-return-correct-error-code-in-qcom_cc_probe_.patch arm64-dts-qcom-sdm630-correct-qfprom-byte-offsets.patch arm64-dts-qcom-sdm630-fix-gpu_speed_bin-size.patch arm64-dts-qcom-sdm845-oneplus-don-t-mark-ts-supply-b.patch -arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch arm64-dts-qcom-sdm845-oneplus-mark-l14a-regulator-as.patch arm-dts-allwinner-sun5i-a13-utoo-p66-delete-power-gp.patch powerpc-uaccess-move-barrier_nospec-out-of-allow_rea.patch diff --git a/queue-6.1/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch b/queue-6.1/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch deleted file mode 100644 index 778708879f..0000000000 --- a/queue-6.1/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3d2504552afd15f260bcabf7bbb1b876a1869ecb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 18 Nov 2025 15:52:26 +0100 -Subject: arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always - on - -From: Casey Connolly - -[ Upstream commit 45d1f42d3e84b5880cf9fab1eb24a7818320eeb7 ] - -The panel regulator doesn't need to be always on, so remove this -property. - -Fixes: 288ef8a42612 ("arm64: dts: sdm845: add oneplus6/6t devices") -Signed-off-by: Casey Connolly -Signed-off-by: David Heidelberg -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20251118-dts-oneplus-regulators-v2-2-3e67cea1e4e7@ixit.cz -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -index 281e1178a2f46..ac3db3d5d2bad 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -@@ -230,7 +230,6 @@ vreg_l14a_1p88: ldo14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-initial-mode = ; -- regulator-always-on; - }; - - vreg_l17a_1p3: ldo17 { --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 0ae7c05f2c..180146d31d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -54,7 +54,6 @@ arm64-dts-tqma8mpql-mba8mpxl-fix-hdmi-cec-pad-contro.patch clk-qcom-return-correct-error-code-in-qcom_cc_probe_.patch arm64-dts-qcom-sdm630-fix-gpu_speed_bin-size.patch arm64-dts-qcom-sdm845-oneplus-don-t-mark-ts-supply-b.patch -arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch arm64-dts-qcom-sdm845-oneplus-mark-l14a-regulator-as.patch arm-dts-allwinner-sun5i-a13-utoo-p66-delete-power-gp.patch powerpc-uaccess-move-barrier_nospec-out-of-allow_rea.patch diff --git a/queue-6.12/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch b/queue-6.12/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch deleted file mode 100644 index 80b9c698f8..0000000000 --- a/queue-6.12/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 61e29a34792f40960e7399679790f835b6ae9415 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 18 Nov 2025 15:52:26 +0100 -Subject: arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always - on - -From: Casey Connolly - -[ Upstream commit 45d1f42d3e84b5880cf9fab1eb24a7818320eeb7 ] - -The panel regulator doesn't need to be always on, so remove this -property. - -Fixes: 288ef8a42612 ("arm64: dts: sdm845: add oneplus6/6t devices") -Signed-off-by: Casey Connolly -Signed-off-by: David Heidelberg -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20251118-dts-oneplus-regulators-v2-2-3e67cea1e4e7@ixit.cz -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -index 56840b6ed6449..3b47baa011c23 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -@@ -252,7 +252,6 @@ vreg_l14a_1p88: ldo14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-initial-mode = ; -- regulator-always-on; - }; - - vreg_l17a_1p3: ldo17 { --- -2.51.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 3bf3549633..5e6542e7eb 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -97,7 +97,6 @@ arm64-dts-tqma8mpql-mba8mp-ras314-fix-hdmi-cec-pad-c.patch clk-qcom-return-correct-error-code-in-qcom_cc_probe_.patch arm64-dts-qcom-sdm630-fix-gpu_speed_bin-size.patch arm64-dts-qcom-sdm845-oneplus-don-t-mark-ts-supply-b.patch -arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch arm64-dts-qcom-sdm845-oneplus-mark-l14a-regulator-as.patch arm64-dts-qcom-x1e80100-fix-usb-combo-phys-ss1-and-s.patch arm64-dts-qcom-msm8994-octagon-fix-analog-devices-ve.patch diff --git a/queue-6.6/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch b/queue-6.6/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch deleted file mode 100644 index 3afd48ddd3..0000000000 --- a/queue-6.6/arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7e1c4fad3d094dbf15e8a6207ad599797f637aee Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 18 Nov 2025 15:52:26 +0100 -Subject: arm64: dts: qcom: sdm845-oneplus: Don't keep panel regulator always - on - -From: Casey Connolly - -[ Upstream commit 45d1f42d3e84b5880cf9fab1eb24a7818320eeb7 ] - -The panel regulator doesn't need to be always on, so remove this -property. - -Fixes: 288ef8a42612 ("arm64: dts: sdm845: add oneplus6/6t devices") -Signed-off-by: Casey Connolly -Signed-off-by: David Heidelberg -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20251118-dts-oneplus-regulators-v2-2-3e67cea1e4e7@ixit.cz -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -index c50d335e0761f..4e335c9fd8185 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi -@@ -251,7 +251,6 @@ vreg_l14a_1p88: ldo14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-initial-mode = ; -- regulator-always-on; - }; - - vreg_l17a_1p3: ldo17 { --- -2.51.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 185d928ac0..6382f1c605 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -62,7 +62,6 @@ arm64-dts-tqma8mpql-mba8mpxl-fix-hdmi-cec-pad-contro.patch clk-qcom-return-correct-error-code-in-qcom_cc_probe_.patch arm64-dts-qcom-sdm630-fix-gpu_speed_bin-size.patch arm64-dts-qcom-sdm845-oneplus-don-t-mark-ts-supply-b.patch -arm64-dts-qcom-sdm845-oneplus-don-t-keep-panel-regul.patch arm64-dts-qcom-sdm845-oneplus-mark-l14a-regulator-as.patch arm-dts-allwinner-sun5i-a13-utoo-p66-delete-power-gp.patch powerpc-uaccess-move-barrier_nospec-out-of-allow_rea.patch