From: Greg Kroah-Hartman Date: Mon, 10 Jul 2023 14:20:40 +0000 (+0200) Subject: drop mips patches from all trees X-Git-Tag: v6.4.3~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d877fe071205b670efaeb5ea604cf5323bb7d8b;p=thirdparty%2Fkernel%2Fstable-queue.git drop mips patches from all trees --- diff --git a/queue-5.10/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch b/queue-5.10/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch deleted file mode 100644 index 7a7d4e78ce2..00000000000 --- a/queue-5.10/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 2bcc8583f77d3deb5d937e1ca59308218e4c4aa1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 4 Jun 2023 16:56:36 +0200 -Subject: MIPS: DTS: CI20: Add parent supplies to ACT8600 regulators - -From: Paul Cercueil - -[ Upstream commit fbf1e42093f8d6346baf17079585fbcebb2ff284 ] - -Provide parent regulators to the ACT8600 regulators that need one. - -Signed-off-by: Paul Cercueil -Signed-off-by: Thomas Bogendoerfer -Stable-dep-of: 944520f85d5b ("MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts") -Signed-off-by: Sasha Levin ---- - arch/mips/boot/dts/ingenic/ci20.dts | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts -index 887035893510b..2a8999efe50a0 100644 ---- a/arch/mips/boot/dts/ingenic/ci20.dts -+++ b/arch/mips/boot/dts/ingenic/ci20.dts -@@ -185,16 +185,19 @@ regulators { - vddcore: DCDC1 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; -+ vp1-supply = <&vcc_33v>; - regulator-always-on; - }; - vddmem: DCDC2 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; -+ vp2-supply = <&vcc_33v>; - regulator-always-on; - }; - vcc_33: DCDC3 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; -+ vp3-supply = <&vcc_33v>; - regulator-always-on; - }; - vcc_50: SUDCDC_REG4 { -@@ -205,21 +208,25 @@ vcc_50: SUDCDC_REG4 { - vcc_25: LDO5 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - wifi_io: LDO6 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - cim_io_28: LDO7 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - cim_io_15: LDO8 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - vrtc_18: LDO_REG9 { --- -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 index 0cc51bb23cf..00000000000 --- a/queue-5.10/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c38e49be2a238e8f490e00b93265dd7220445a14 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 22 Jun 2023 19:59:34 +0200 -Subject: MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts - -From: Paul Cercueil - -[ Upstream commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 ] - -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 -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/boot/dts/ingenic/ci20.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts -index 2a8999efe50a0..9839daca65d53 100644 ---- a/arch/mips/boot/dts/ingenic/ci20.dts -+++ b/arch/mips/boot/dts/ingenic/ci20.dts -@@ -183,8 +183,8 @@ act8600: act8600@5a { - - regulators { - vddcore: DCDC1 { -- regulator-min-microvolt = <1100000>; -- regulator-max-microvolt = <1100000>; -+ regulator-min-microvolt = <1125000>; -+ regulator-max-microvolt = <1125000>; - vp1-supply = <&vcc_33v>; - regulator-always-on; - }; --- -2.39.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 07253119463..91fb00d3630 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -175,8 +175,6 @@ clk-ti-clkctrl-check-return-value-of-kasprintf.patch drivers-meson-secure-pwrc-always-enable-dma-domain.patch ovl-update-of-dentry-revalidate-flags-after-copy-up.patch asoc-imx-audmix-check-return-value-of-devm_kasprintf.patch -mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch -mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch pci-cadence-fix-gen2-link-retraining-process.patch scsi-qedf-fix-null-dereference-in-error-handling.patch pinctrl-bcm2835-handle-gpiochip_add_pin_range-errors.patch diff --git a/queue-5.15/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch b/queue-5.15/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch deleted file mode 100644 index 9378e6df8bf..00000000000 --- a/queue-5.15/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch +++ /dev/null @@ -1,72 +0,0 @@ -From d7b1eb93aa5a3f60b2a46f3bc70a4289d1c2c257 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 4 Jun 2023 16:56:36 +0200 -Subject: MIPS: DTS: CI20: Add parent supplies to ACT8600 regulators - -From: Paul Cercueil - -[ Upstream commit fbf1e42093f8d6346baf17079585fbcebb2ff284 ] - -Provide parent regulators to the ACT8600 regulators that need one. - -Signed-off-by: Paul Cercueil -Signed-off-by: Thomas Bogendoerfer -Stable-dep-of: 944520f85d5b ("MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts") -Signed-off-by: Sasha Levin ---- - arch/mips/boot/dts/ingenic/ci20.dts | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts -index 7f98ee0208efb..2a6c971867795 100644 ---- a/arch/mips/boot/dts/ingenic/ci20.dts -+++ b/arch/mips/boot/dts/ingenic/ci20.dts -@@ -224,16 +224,19 @@ regulators { - vddcore: DCDC1 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; -+ vp1-supply = <&vcc_33v>; - regulator-always-on; - }; - vddmem: DCDC2 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; -+ vp2-supply = <&vcc_33v>; - regulator-always-on; - }; - vcc_33: DCDC3 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; -+ vp3-supply = <&vcc_33v>; - regulator-always-on; - }; - vcc_50: SUDCDC_REG4 { -@@ -244,21 +247,25 @@ vcc_50: SUDCDC_REG4 { - vcc_25: LDO5 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - wifi_io: LDO6 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - cim_io_28: LDO7 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - cim_io_15: LDO8 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - vrtc_18: LDO_REG9 { --- -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 index 050bc31abf0..00000000000 --- a/queue-5.15/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c96a8fa07d1e6047ee16bc780ce2d85e79f61d86 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 22 Jun 2023 19:59:34 +0200 -Subject: MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts - -From: Paul Cercueil - -[ Upstream commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 ] - -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 -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/boot/dts/ingenic/ci20.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts -index 2a6c971867795..d3661ff0f0003 100644 ---- a/arch/mips/boot/dts/ingenic/ci20.dts -+++ b/arch/mips/boot/dts/ingenic/ci20.dts -@@ -222,8 +222,8 @@ act8600: act8600@5a { - - regulators { - vddcore: DCDC1 { -- regulator-min-microvolt = <1100000>; -- regulator-max-microvolt = <1100000>; -+ regulator-min-microvolt = <1125000>; -+ regulator-max-microvolt = <1125000>; - vp1-supply = <&vcc_33v>; - regulator-always-on; - }; --- -2.39.2 - diff --git a/queue-5.15/series b/queue-5.15/series index 18a899bb139..ccef3d10691 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -200,8 +200,6 @@ drivers-meson-secure-pwrc-always-enable-dma-domain.patch ovl-update-of-dentry-revalidate-flags-after-copy-up.patch asoc-imx-audmix-check-return-value-of-devm_kasprintf.patch clk-fix-memory-leak-in-devm_clk_notifier_register.patch -mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch -mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch pci-cadence-fix-gen2-link-retraining-process.patch pci-vmd-reset-vmd-config-register-between-soft-reboo.patch scsi-qedf-fix-null-dereference-in-error-handling.patch diff --git a/queue-6.1/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch b/queue-6.1/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch deleted file mode 100644 index 7d0b47d3cac..00000000000 --- a/queue-6.1/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch +++ /dev/null @@ -1,72 +0,0 @@ -From bfb66726b6abc83dcca11250f5a095ad9aca914c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 4 Jun 2023 16:56:36 +0200 -Subject: MIPS: DTS: CI20: Add parent supplies to ACT8600 regulators - -From: Paul Cercueil - -[ Upstream commit fbf1e42093f8d6346baf17079585fbcebb2ff284 ] - -Provide parent regulators to the ACT8600 regulators that need one. - -Signed-off-by: Paul Cercueil -Signed-off-by: Thomas Bogendoerfer -Stable-dep-of: 944520f85d5b ("MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts") -Signed-off-by: Sasha Levin ---- - arch/mips/boot/dts/ingenic/ci20.dts | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts -index 994c7ebfddc80..0da8182698e36 100644 ---- a/arch/mips/boot/dts/ingenic/ci20.dts -+++ b/arch/mips/boot/dts/ingenic/ci20.dts -@@ -242,16 +242,19 @@ regulators { - vddcore: DCDC1 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; -+ vp1-supply = <&vcc_33v>; - regulator-always-on; - }; - vddmem: DCDC2 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; -+ vp2-supply = <&vcc_33v>; - regulator-always-on; - }; - vcc_33: DCDC3 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; -+ vp3-supply = <&vcc_33v>; - regulator-always-on; - }; - vcc_50: SUDCDC_REG4 { -@@ -262,21 +265,25 @@ vcc_50: SUDCDC_REG4 { - vcc_25: LDO5 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - wifi_io: LDO6 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - cim_io_28: LDO7 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - cim_io_15: LDO8 { - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; -+ inl-supply = <&vcc_33v>; - regulator-always-on; - }; - vrtc_18: LDO_REG9 { --- -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 index cee6f068535..00000000000 --- a/queue-6.1/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4e09d8e67aecb3958787b56bc17a193de5f9a5e1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 22 Jun 2023 19:59:34 +0200 -Subject: MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts - -From: Paul Cercueil - -[ Upstream commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 ] - -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 -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/boot/dts/ingenic/ci20.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts -index 0da8182698e36..6a179e0322c59 100644 ---- a/arch/mips/boot/dts/ingenic/ci20.dts -+++ b/arch/mips/boot/dts/ingenic/ci20.dts -@@ -240,8 +240,8 @@ act8600: act8600@5a { - - regulators { - vddcore: DCDC1 { -- regulator-min-microvolt = <1100000>; -- regulator-max-microvolt = <1100000>; -+ regulator-min-microvolt = <1125000>; -+ regulator-max-microvolt = <1125000>; - vp1-supply = <&vcc_33v>; - regulator-always-on; - }; --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 473c5134e34..54ee05aaea5 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -292,8 +292,6 @@ clk-fix-memory-leak-in-devm_clk_notifier_register.patch arm-dts-lan966x-kontron-d10-fix-board-reset.patch arm-dts-lan966x-kontron-d10-fix-spi-cs.patch asoc-amd-acp-clear-pdm-dma-interrupt-mask.patch -mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch -mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch pci-cadence-fix-gen2-link-retraining-process.patch pci-vmd-reset-vmd-config-register-between-soft-reboo.patch scsi-qedf-fix-null-dereference-in-error-handling.patch