From: Greg Kroah-Hartman Date: Mon, 17 Jul 2023 17:26:04 +0000 (+0200) Subject: drop some mips patches from 6.4 X-Git-Tag: v6.1.39~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6e1dd60bd85c9319c9a8c80564d6612dbc0b2a6;p=thirdparty%2Fkernel%2Fstable-queue.git drop some mips patches from 6.4 --- diff --git a/queue-6.4/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch b/queue-6.4/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch deleted file mode 100644 index 626fa327574..00000000000 --- a/queue-6.4/mips-dts-ci20-add-parent-supplies-to-act8600-regulat.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 5f4b0b60828cb4c45c030bea9cd77c8bd14f497c 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 2b1284c6c64a6..eac6b3411b5f7 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.4/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch b/queue-6.4/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch deleted file mode 100644 index d3787357ba3..00000000000 --- a/queue-6.4/mips-dts-ci20-raise-vddcore-voltage-to-1.125-volts.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f8d838f450cd0d6491044f5a61457a129ac6d248 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 eac6b3411b5f7..c0f6c4d3618e1 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.4/series b/queue-6.4/series index 4210f2bdd17..697ad456d19 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -428,8 +428,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 iommufd-do-not-access-the-area-pointer-after-unlocki.patch iommufd-call-iopt_area_contig_done-under-the-lock.patch pci-cadence-fix-gen2-link-retraining-process.patch