]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop a mips patch from the tree
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jul 2023 20:10:17 +0000 (22:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jul 2023 20:10:17 +0000 (22:10 +0200)
queue-5.10/mips-dts-ci20-fix-act8600-regulator-node-names.patch [deleted file]
queue-5.10/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch [deleted file]
queue-5.10/series
queue-5.15/mips-dts-ci20-fix-act8600-regulator-node-names.patch [deleted file]
queue-5.15/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch [deleted file]
queue-5.15/series
queue-6.1/mips-dts-ci20-fix-act8600-regulator-node-names.patch [deleted file]
queue-6.1/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch [deleted file]
queue-6.1/series
queue-6.4/mips-dts-ci20-fix-act8600-regulator-node-names.patch [deleted file]
queue-6.4/series

diff --git a/queue-5.10/mips-dts-ci20-fix-act8600-regulator-node-names.patch b/queue-5.10/mips-dts-ci20-fix-act8600-regulator-node-names.patch
deleted file mode 100644 (file)
index e075b65..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-From 139b3b094ac79bfb59b7ee0a3d6b28b1c28227e3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 4 Jun 2023 16:56:35 +0200
-Subject: MIPS: DTS: CI20: Fix ACT8600 regulator node names
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 08384e80a70fb1942510ab5f0ce27bad134e634e ]
-
-The Device Tree was using invalid node names for the ACT8600 regulators.
-To be fair, it is not the original committer's fault, as the
-documentation did gives invalid names as well.
-
-In theory, the fix should have been to modify the driver to accept the
-alternative names. However, even though the act8865 driver spits
-warnings, the kernel seemed to work fine with what is currently
-supported upstream. For that reason, I think it is okay to just update
-the DTS.
-
-I removed the "regulator-name" too, since they really didn't bring any
-information. The node names are enough.
-
-Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++-------------------
- 1 file changed, 8 insertions(+), 19 deletions(-)
-
-diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
-index 75f5bfbf2c375..887035893510b 100644
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -180,59 +180,49 @@ &i2c0 {
-       act8600: act8600@5a {
-               compatible = "active-semi,act8600";
-               reg = <0x5a>;
--              status = "okay";
-               regulators {
--                      vddcore: SUDCDC1 {
--                              regulator-name = "DCDC_REG1";
-+                      vddcore: DCDC1 {
-                               regulator-min-microvolt = <1100000>;
-                               regulator-max-microvolt = <1100000>;
-                               regulator-always-on;
-                       };
--                      vddmem: SUDCDC2 {
--                              regulator-name = "DCDC_REG2";
-+                      vddmem: DCDC2 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
--                      vcc_33: SUDCDC3 {
--                              regulator-name = "DCDC_REG3";
-+                      vcc_33: DCDC3 {
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
--                      vcc_50: SUDCDC4 {
--                              regulator-name = "SUDCDC_REG4";
-+                      vcc_50: SUDCDC_REG4 {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                       };
--                      vcc_25: LDO_REG5 {
--                              regulator-name = "LDO_REG5";
-+                      vcc_25: LDO5 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      wifi_io: LDO_REG6 {
--                              regulator-name = "LDO_REG6";
-+                      wifi_io: LDO6 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      vcc_28: LDO_REG7 {
--                              regulator-name = "LDO_REG7";
-+                      cim_io_28: LDO7 {
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <2800000>;
-                               regulator-always-on;
-                       };
--                      vcc_15: LDO_REG8 {
--                              regulator-name = "LDO_REG8";
-+                      cim_io_15: LDO8 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
-                       vrtc_18: LDO_REG9 {
--                              regulator-name = "LDO_REG9";
-                               /* Despite the datasheet stating 3.3V
-                                * for REG9 and the driver expecting that,
-                                * REG9 outputs 1.8V.
-@@ -246,7 +236,6 @@ vrtc_18: LDO_REG9 {
-                               regulator-always-on;
-                       };
-                       vcc_11: LDO_REG10 {
--                              regulator-name = "LDO_REG10";
-                               regulator-min-microvolt = <1200000>;
-                               regulator-max-microvolt = <1200000>;
-                               regulator-always-on;
--- 
-2.39.2
-
diff --git a/queue-5.10/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch b/queue-5.10/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch
deleted file mode 100644 (file)
index 3abfcbb..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 Mon Sep 17 00:00:00 2001
-From: Paul Cercueil <paul@crapouillou.net>
-Date: Thu, 22 Jun 2023 19:59:34 +0200
-Subject: MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 upstream.
-
-Commit 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node
-names") caused the VDDCORE power supply (regulated by the ACT8600's
-DCDC1 output) to drop from a voltage of 1.2V configured by the
-bootloader, to the 1.1V set in the Device Tree.
-
-According to the documentation, the VDDCORE supply should be between
-0.99V and 1.21V; both values are therefore within the supported range.
-
-However, VDDCORE being 1.1V results in the CI20 being very unstable,
-with corrupted memory, failures to boot, or reboots at random. The
-reason might be succint drops of the voltage below the minimum required.
-
-Raising the minimum voltage to 1.125 volts seems to be enough to address
-this issue, while still keeping a relatively low core voltage which
-helps for power consumption and thermals.
-
-Fixes: 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node names")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -183,8 +183,8 @@
-               regulators {
-                       vddcore: DCDC1 {
--                              regulator-min-microvolt = <1100000>;
--                              regulator-max-microvolt = <1100000>;
-+                              regulator-min-microvolt = <1125000>;
-+                              regulator-max-microvolt = <1125000>;
-                               regulator-always-on;
-                       };
-                       vddmem: DCDC2 {
index c84b9bcc7e50f3f899e733fea3c41d0ef1f4da28..744b077b3e4608a39028bc78ccdac41d4253808c 100644 (file)
@@ -150,7 +150,6 @@ hwmon-adm1275-enable-adm1272-temperature-reporting.patch
 hwmon-adm1275-allow-setting-sample-averaging.patch
 hwmon-pmbus-adm1275-fix-problems-with-temperature-mo.patch
 arm-dts-bcm5301x-fix-duplex-full-full-duplex.patch
-mips-dts-ci20-fix-act8600-regulator-node-names.patch
 drm-amdkfd-fix-potential-deallocation-of-previously-.patch
 drm-radeon-fix-possible-division-by-zero-errors.patch
 amdgpu-validate-offset_in_bo-of-drm_amdgpu_gem_va.patch
@@ -310,7 +309,6 @@ fanotify-disallow-mount-sb-marks-on-kernel-internal-pseudo-fs.patch
 tpm-tpm_tis-claim-locality-in-interrupt-handler.patch
 selftests-bpf-add-verifier-test-for-ptr_to_mem-spill.patch
 block-add-overflow-checks-for-amiga-partition-support.patch
-mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch
 sh-pgtable-3level-fix-cast-to-pointer-from-integer-of-different-size.patch
 netfilter-nf_tables-use-net_generic-infra-for-transaction-data.patch
 netfilter-nf_tables-add-rescheduling-points-during-loop-detection-walks.patch
diff --git a/queue-5.15/mips-dts-ci20-fix-act8600-regulator-node-names.patch b/queue-5.15/mips-dts-ci20-fix-act8600-regulator-node-names.patch
deleted file mode 100644 (file)
index 3cb8b55..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-From c5aa8e045a095108423fd50ab26bcee1bc597cea Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 4 Jun 2023 16:56:35 +0200
-Subject: MIPS: DTS: CI20: Fix ACT8600 regulator node names
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 08384e80a70fb1942510ab5f0ce27bad134e634e ]
-
-The Device Tree was using invalid node names for the ACT8600 regulators.
-To be fair, it is not the original committer's fault, as the
-documentation did gives invalid names as well.
-
-In theory, the fix should have been to modify the driver to accept the
-alternative names. However, even though the act8865 driver spits
-warnings, the kernel seemed to work fine with what is currently
-supported upstream. For that reason, I think it is okay to just update
-the DTS.
-
-I removed the "regulator-name" too, since they really didn't bring any
-information. The node names are enough.
-
-Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++-------------------
- 1 file changed, 8 insertions(+), 19 deletions(-)
-
-diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
-index 74d49dc134384..7f98ee0208efb 100644
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -219,59 +219,49 @@ &i2c0 {
-       act8600: act8600@5a {
-               compatible = "active-semi,act8600";
-               reg = <0x5a>;
--              status = "okay";
-               regulators {
--                      vddcore: SUDCDC1 {
--                              regulator-name = "DCDC_REG1";
-+                      vddcore: DCDC1 {
-                               regulator-min-microvolt = <1100000>;
-                               regulator-max-microvolt = <1100000>;
-                               regulator-always-on;
-                       };
--                      vddmem: SUDCDC2 {
--                              regulator-name = "DCDC_REG2";
-+                      vddmem: DCDC2 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
--                      vcc_33: SUDCDC3 {
--                              regulator-name = "DCDC_REG3";
-+                      vcc_33: DCDC3 {
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
--                      vcc_50: SUDCDC4 {
--                              regulator-name = "SUDCDC_REG4";
-+                      vcc_50: SUDCDC_REG4 {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                       };
--                      vcc_25: LDO_REG5 {
--                              regulator-name = "LDO_REG5";
-+                      vcc_25: LDO5 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      wifi_io: LDO_REG6 {
--                              regulator-name = "LDO_REG6";
-+                      wifi_io: LDO6 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      vcc_28: LDO_REG7 {
--                              regulator-name = "LDO_REG7";
-+                      cim_io_28: LDO7 {
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <2800000>;
-                               regulator-always-on;
-                       };
--                      vcc_15: LDO_REG8 {
--                              regulator-name = "LDO_REG8";
-+                      cim_io_15: LDO8 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
-                       vrtc_18: LDO_REG9 {
--                              regulator-name = "LDO_REG9";
-                               /* Despite the datasheet stating 3.3V
-                                * for REG9 and the driver expecting that,
-                                * REG9 outputs 1.8V.
-@@ -285,7 +275,6 @@ vrtc_18: LDO_REG9 {
-                               regulator-always-on;
-                       };
-                       vcc_11: LDO_REG10 {
--                              regulator-name = "LDO_REG10";
-                               regulator-min-microvolt = <1200000>;
-                               regulator-max-microvolt = <1200000>;
-                               regulator-always-on;
--- 
-2.39.2
-
diff --git a/queue-5.15/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch b/queue-5.15/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch
deleted file mode 100644 (file)
index 5cc48e3..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 Mon Sep 17 00:00:00 2001
-From: Paul Cercueil <paul@crapouillou.net>
-Date: Thu, 22 Jun 2023 19:59:34 +0200
-Subject: MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 upstream.
-
-Commit 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node
-names") caused the VDDCORE power supply (regulated by the ACT8600's
-DCDC1 output) to drop from a voltage of 1.2V configured by the
-bootloader, to the 1.1V set in the Device Tree.
-
-According to the documentation, the VDDCORE supply should be between
-0.99V and 1.21V; both values are therefore within the supported range.
-
-However, VDDCORE being 1.1V results in the CI20 being very unstable,
-with corrupted memory, failures to boot, or reboots at random. The
-reason might be succint drops of the voltage below the minimum required.
-
-Raising the minimum voltage to 1.125 volts seems to be enough to address
-this issue, while still keeping a relatively low core voltage which
-helps for power consumption and thermals.
-
-Fixes: 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node names")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -222,8 +222,8 @@
-               regulators {
-                       vddcore: DCDC1 {
--                              regulator-min-microvolt = <1100000>;
--                              regulator-max-microvolt = <1100000>;
-+                              regulator-min-microvolt = <1125000>;
-+                              regulator-max-microvolt = <1125000>;
-                               regulator-always-on;
-                       };
-                       vddmem: DCDC2 {
index 63ef1af9376a966d453034d7f89f5683bb72e2af..9d907790d5545a166c5df0f631c112c6d1c86ec7 100644 (file)
@@ -162,7 +162,6 @@ hwmon-gsc-hwmon-fix-fan-pwm-temperature-scaling.patch
 hwmon-adm1275-allow-setting-sample-averaging.patch
 hwmon-pmbus-adm1275-fix-problems-with-temperature-mo.patch
 arm-dts-bcm5301x-fix-duplex-full-full-duplex.patch
-mips-dts-ci20-fix-act8600-regulator-node-names.patch
 drm-amdkfd-fix-potential-deallocation-of-previously-.patch
 drm-amd-display-fix-artifacting-on-edp-panels-when-e.patch
 drm-radeon-fix-possible-division-by-zero-errors.patch
@@ -380,7 +379,6 @@ fs-no-need-to-check-source.patch
 ovl-fix-null-pointer-dereference-in-ovl_get_acl_rcu.patch
 fanotify-disallow-mount-sb-marks-on-kernel-internal-pseudo-fs.patch
 netfilter-nf_tables-unbind-non-anonymous-set-if-rule-construction-fails.patch
-mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch
 netfilter-conntrack-avoid-nf_ct_helper_hash-uses-after-free.patch
 netfilter-nf_tables-do-not-ignore-genmask-when-looking-up-chain-by-id.patch
 netfilter-nf_tables-prevent-oob-access-in-nft_byteorder_eval.patch
diff --git a/queue-6.1/mips-dts-ci20-fix-act8600-regulator-node-names.patch b/queue-6.1/mips-dts-ci20-fix-act8600-regulator-node-names.patch
deleted file mode 100644 (file)
index aec3620..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-From 22800b93383156a4c30e421edc2bce1df81ab8c7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 4 Jun 2023 16:56:35 +0200
-Subject: MIPS: DTS: CI20: Fix ACT8600 regulator node names
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 08384e80a70fb1942510ab5f0ce27bad134e634e ]
-
-The Device Tree was using invalid node names for the ACT8600 regulators.
-To be fair, it is not the original committer's fault, as the
-documentation did gives invalid names as well.
-
-In theory, the fix should have been to modify the driver to accept the
-alternative names. However, even though the act8865 driver spits
-warnings, the kernel seemed to work fine with what is currently
-supported upstream. For that reason, I think it is okay to just update
-the DTS.
-
-I removed the "regulator-name" too, since they really didn't bring any
-information. The node names are enough.
-
-Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++-------------------
- 1 file changed, 8 insertions(+), 19 deletions(-)
-
-diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
-index 8f21d2304737c..994c7ebfddc80 100644
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -237,59 +237,49 @@ &i2c0 {
-       act8600: act8600@5a {
-               compatible = "active-semi,act8600";
-               reg = <0x5a>;
--              status = "okay";
-               regulators {
--                      vddcore: SUDCDC1 {
--                              regulator-name = "DCDC_REG1";
-+                      vddcore: DCDC1 {
-                               regulator-min-microvolt = <1100000>;
-                               regulator-max-microvolt = <1100000>;
-                               regulator-always-on;
-                       };
--                      vddmem: SUDCDC2 {
--                              regulator-name = "DCDC_REG2";
-+                      vddmem: DCDC2 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
--                      vcc_33: SUDCDC3 {
--                              regulator-name = "DCDC_REG3";
-+                      vcc_33: DCDC3 {
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
--                      vcc_50: SUDCDC4 {
--                              regulator-name = "SUDCDC_REG4";
-+                      vcc_50: SUDCDC_REG4 {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                       };
--                      vcc_25: LDO_REG5 {
--                              regulator-name = "LDO_REG5";
-+                      vcc_25: LDO5 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      wifi_io: LDO_REG6 {
--                              regulator-name = "LDO_REG6";
-+                      wifi_io: LDO6 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      vcc_28: LDO_REG7 {
--                              regulator-name = "LDO_REG7";
-+                      cim_io_28: LDO7 {
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <2800000>;
-                               regulator-always-on;
-                       };
--                      vcc_15: LDO_REG8 {
--                              regulator-name = "LDO_REG8";
-+                      cim_io_15: LDO8 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
-                       vrtc_18: LDO_REG9 {
--                              regulator-name = "LDO_REG9";
-                               /* Despite the datasheet stating 3.3V
-                                * for REG9 and the driver expecting that,
-                                * REG9 outputs 1.8V.
-@@ -303,7 +293,6 @@ vrtc_18: LDO_REG9 {
-                               regulator-always-on;
-                       };
-                       vcc_11: LDO_REG10 {
--                              regulator-name = "LDO_REG10";
-                               regulator-min-microvolt = <1200000>;
-                               regulator-max-microvolt = <1200000>;
-                               regulator-always-on;
--- 
-2.39.2
-
diff --git a/queue-6.1/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch b/queue-6.1/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch
deleted file mode 100644 (file)
index 017a4ce..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 Mon Sep 17 00:00:00 2001
-From: Paul Cercueil <paul@crapouillou.net>
-Date: Thu, 22 Jun 2023 19:59:34 +0200
-Subject: MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 upstream.
-
-Commit 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node
-names") caused the VDDCORE power supply (regulated by the ACT8600's
-DCDC1 output) to drop from a voltage of 1.2V configured by the
-bootloader, to the 1.1V set in the Device Tree.
-
-According to the documentation, the VDDCORE supply should be between
-0.99V and 1.21V; both values are therefore within the supported range.
-
-However, VDDCORE being 1.1V results in the CI20 being very unstable,
-with corrupted memory, failures to boot, or reboots at random. The
-reason might be succint drops of the voltage below the minimum required.
-
-Raising the minimum voltage to 1.125 volts seems to be enough to address
-this issue, while still keeping a relatively low core voltage which
-helps for power consumption and thermals.
-
-Fixes: 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node names")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -240,8 +240,8 @@
-               regulators {
-                       vddcore: DCDC1 {
--                              regulator-min-microvolt = <1100000>;
--                              regulator-max-microvolt = <1100000>;
-+                              regulator-min-microvolt = <1125000>;
-+                              regulator-max-microvolt = <1125000>;
-                               regulator-always-on;
-                       };
-                       vddmem: DCDC2 {
index 31a7c1f41cb86b94cec688b158638dca54932b70..6778267a489df842d52d0e2c45b728c21523be3d 100644 (file)
@@ -232,7 +232,6 @@ hwmon-gsc-hwmon-fix-fan-pwm-temperature-scaling.patch
 hwmon-pmbus-adm1275-fix-problems-with-temperature-mo.patch
 arm-dts-bcm5301x-fix-duplex-full-full-duplex.patch
 clk-export-clk_hw_forward_rate_request.patch
-mips-dts-ci20-fix-act8600-regulator-node-names.patch
 drm-amd-display-fix-a-test-calculateprefetchschedule.patch
 drm-amd-display-fix-a-test-dml32_rq_dlg_get_rq_reg.patch
 drm-amdkfd-fix-potential-deallocation-of-previously-.patch
@@ -576,7 +575,6 @@ drm-i915-tc-fix-tc-port-link-ref-init-for-dp-mst-during-hw-readout.patch
 drm-i915-tc-fix-system-resume-mst-mode-restore-for-dp-alt-sinks.patch
 mtd-parsers-refer-to-arch_bcmbca-instead-of-arch_bcm4908.patch
 netfilter-nf_tables-unbind-non-anonymous-set-if-rule-construction-fails.patch
-mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch
 netfilter-conntrack-avoid-nf_ct_helper_hash-uses-after-free.patch
 netfilter-nf_tables-do-not-ignore-genmask-when-looking-up-chain-by-id.patch
 netfilter-nf_tables-prevent-oob-access-in-nft_byteorder_eval.patch
diff --git a/queue-6.4/mips-dts-ci20-fix-act8600-regulator-node-names.patch b/queue-6.4/mips-dts-ci20-fix-act8600-regulator-node-names.patch
deleted file mode 100644 (file)
index c9375b8..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-From 991440c65040be03a3110520df89ac30940a378a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 4 Jun 2023 16:56:35 +0200
-Subject: MIPS: DTS: CI20: Fix ACT8600 regulator node names
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 08384e80a70fb1942510ab5f0ce27bad134e634e ]
-
-The Device Tree was using invalid node names for the ACT8600 regulators.
-To be fair, it is not the original committer's fault, as the
-documentation did gives invalid names as well.
-
-In theory, the fix should have been to modify the driver to accept the
-alternative names. However, even though the act8865 driver spits
-warnings, the kernel seemed to work fine with what is currently
-supported upstream. For that reason, I think it is okay to just update
-the DTS.
-
-I removed the "regulator-name" too, since they really didn't bring any
-information. The node names are enough.
-
-Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++-------------------
- 1 file changed, 8 insertions(+), 19 deletions(-)
-
-diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
-index 239c4537484d0..2b1284c6c64a6 100644
---- a/arch/mips/boot/dts/ingenic/ci20.dts
-+++ b/arch/mips/boot/dts/ingenic/ci20.dts
-@@ -237,59 +237,49 @@ &i2c0 {
-       act8600: act8600@5a {
-               compatible = "active-semi,act8600";
-               reg = <0x5a>;
--              status = "okay";
-               regulators {
--                      vddcore: SUDCDC1 {
--                              regulator-name = "DCDC_REG1";
-+                      vddcore: DCDC1 {
-                               regulator-min-microvolt = <1100000>;
-                               regulator-max-microvolt = <1100000>;
-                               regulator-always-on;
-                       };
--                      vddmem: SUDCDC2 {
--                              regulator-name = "DCDC_REG2";
-+                      vddmem: DCDC2 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
--                      vcc_33: SUDCDC3 {
--                              regulator-name = "DCDC_REG3";
-+                      vcc_33: DCDC3 {
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
--                      vcc_50: SUDCDC4 {
--                              regulator-name = "SUDCDC_REG4";
-+                      vcc_50: SUDCDC_REG4 {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                       };
--                      vcc_25: LDO_REG5 {
--                              regulator-name = "LDO_REG5";
-+                      vcc_25: LDO5 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      wifi_io: LDO_REG6 {
--                              regulator-name = "LDO_REG6";
-+                      wifi_io: LDO6 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-always-on;
-                       };
--                      vcc_28: LDO_REG7 {
--                              regulator-name = "LDO_REG7";
-+                      cim_io_28: LDO7 {
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <2800000>;
-                               regulator-always-on;
-                       };
--                      vcc_15: LDO_REG8 {
--                              regulator-name = "LDO_REG8";
-+                      cim_io_15: LDO8 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                       };
-                       vrtc_18: LDO_REG9 {
--                              regulator-name = "LDO_REG9";
-                               /* Despite the datasheet stating 3.3V
-                                * for REG9 and the driver expecting that,
-                                * REG9 outputs 1.8V.
-@@ -303,7 +293,6 @@ vrtc_18: LDO_REG9 {
-                               regulator-always-on;
-                       };
-                       vcc_11: LDO_REG10 {
--                              regulator-name = "LDO_REG10";
-                               regulator-min-microvolt = <1200000>;
-                               regulator-max-microvolt = <1200000>;
-                               regulator-always-on;
--- 
-2.39.2
-
index 1cab53052fbdb7a99a97ea37b84edee9918b4c21..250a1d01dc0b149663330c0d5e78de8dc1971bea 100644 (file)
@@ -360,7 +360,6 @@ hwmon-gsc-hwmon-fix-fan-pwm-temperature-scaling.patch
 hwmon-pmbus-adm1275-fix-problems-with-temperature-mo.patch
 arm-dts-bcm5301x-fix-duplex-full-full-duplex.patch
 clk-export-clk_hw_forward_rate_request.patch
-mips-dts-ci20-fix-act8600-regulator-node-names.patch
 drm-amd-display-fix-a-test-calculateprefetchschedule.patch
 drm-amd-display-fix-a-test-dml32_rq_dlg_get_rq_reg.patch
 drm-amdkfd-fix-potential-deallocation-of-previously-.patch