From cdaf03c615b4d81fdb350130840efe7cfaf39313 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 31 Dec 2022 10:54:37 +0100 Subject: [PATCH] drop some dts gpio patches frome everywhere --- ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-4.14/series | 2 - ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-4.19/series | 2 - ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-4.9/series | 1 - ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-5.10/series | 2 - ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-5.15/series | 2 - ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-5.4/series | 2 - ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-6.0/series | 2 - ...-38x-fix-compatible-string-for-gpios.patch | 56 ------------------- ...-39x-fix-compatible-string-for-gpios.patch | 52 ----------------- queue-6.1/series | 2 - 23 files changed, 823 deletions(-) delete mode 100644 queue-4.14/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-4.14/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-4.19/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-4.19/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-4.9/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-5.10/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-5.10/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-5.15/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-5.15/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-5.4/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-5.4/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-6.0/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-6.0/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-6.1/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch delete mode 100644 queue-6.1/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch diff --git a/queue-4.14/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-4.14/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 0e1c2867738..00000000000 --- a/queue-4.14/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7d08c6efd99c82610ba2b260a1743f3c3011d0f9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index 00ff549d4e39..c68ee421475f 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -319,7 +319,7 @@ sata3_pins: sata-pins-3 { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -337,7 +337,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-4.14/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-4.14/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index fa0d758de87..00000000000 --- a/queue-4.14/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 35418b767106c0394ec68a661a048e3831f330ae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 8c162013c1cb..44798a0aa33b 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -253,7 +253,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -267,7 +267,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 61783dd832e..148d74351e3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -34,8 +34,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch pstore-ram-fix-error-return-code-in-ramoops_probe.patch arm-mmp-fix-timer_read-delay.patch pstore-avoid-kcore-oops-by-vmap-ing-with-vm_ioremap.patch diff --git a/queue-4.19/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-4.19/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 3d6cfbf6c74..00000000000 --- a/queue-4.19/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1a0b7adbe4ad15fa1739ac786571e5247207b980 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index 6f32f1233282..819fd66a5de0 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -287,7 +287,7 @@ sata3_pins: sata-pins-3 { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -305,7 +305,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-4.19/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-4.19/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index c0703b4c439..00000000000 --- a/queue-4.19/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3fdd76cf14b296585404ffa6c3541579dc623370 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index f589112e7697..a880c8915a2c 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -216,7 +216,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -230,7 +230,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 49bb91e65b7..e88af1466df 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -37,8 +37,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch pstore-ram-fix-error-return-code-in-ramoops_probe.patch arm-mmp-fix-timer_read-delay.patch pstore-avoid-kcore-oops-by-vmap-ing-with-vm_ioremap.patch diff --git a/queue-4.9/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-4.9/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 7055d41cc1d..00000000000 --- a/queue-4.9/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 10f754198eeb53259a63cc30bbf37828a470f0e5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 3ca83e37112b..9155075eaa8a 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -253,7 +253,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -267,7 +267,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 7e29cd96079..6b5c057f37e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -22,7 +22,6 @@ arm-dts-armada-xp-fix-assigned-addresses-for-every-p.patch arm-dts-armada-375-fix-assigned-addresses-for-every-.patch arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch arm-mmp-fix-timer_read-delay.patch pstore-avoid-kcore-oops-by-vmap-ing-with-vm_ioremap.patch cpuidle-dt-return-the-correct-numbers-of-parsed-idle.patch diff --git a/queue-5.10/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-5.10/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 952cd5941a4..00000000000 --- a/queue-5.10/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b6ebb7d7063cfec5a86d40ed92d5774e33e91202 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index df3c8d1d8f64..9343de6947b3 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -292,7 +292,7 @@ sata3_pins: sata-pins-3 { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -310,7 +310,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-5.10/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-5.10/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index c0fb02ceddf..00000000000 --- a/queue-5.10/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c6093be28d1a38da1942431c7aea5ab937815e0d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 9525e7b7f436..9aad10fd3823 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -213,7 +213,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -227,7 +227,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index eea6f65c8ae..1b1e2ee58e1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -34,8 +34,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch arm64-dts-armada-3720-turris-mox-add-missing-interru.patch pstore-ram-fix-error-return-code-in-ramoops_probe.patch arm-mmp-fix-timer_read-delay.patch diff --git a/queue-5.15/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-5.15/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 20dfe385654..00000000000 --- a/queue-5.15/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7b259ddae6ac0f39b4ecd9d84845eeec63ad3155 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index df3c8d1d8f64..9343de6947b3 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -292,7 +292,7 @@ sata3_pins: sata-pins-3 { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -310,7 +310,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-5.15/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-5.15/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index c47592b7f5c..00000000000 --- a/queue-5.15/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 59d61df704eb782b82d6d7fcdd45951a8e0f7412 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 9525e7b7f436..9aad10fd3823 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -213,7 +213,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -227,7 +227,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 5bd03a8bb44..01d77cf78ac 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -51,8 +51,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch arm64-dts-armada-3720-turris-mox-add-missing-interru.patch seccomp-move-copy_seccomp-to-no-failure-path.patch pstore-ram-fix-error-return-code-in-ramoops_probe.patch diff --git a/queue-5.4/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-5.4/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 49652b8735e..00000000000 --- a/queue-5.4/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4a990f8c4297e62aaf358a9425f5dfdb2eda698e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index 5b82e58a1cf0..b5bc0300a8c5 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -289,7 +289,7 @@ sata3_pins: sata-pins-3 { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -307,7 +307,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-5.4/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-5.4/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 889badb7a02..00000000000 --- a/queue-5.4/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a093eaa190b849e427e42de944ffc9478f59c25c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index cd7a46c48d19..2d3d536c36e1 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -217,7 +217,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -231,7 +231,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 40dd121ede4..86043a177ae 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -42,8 +42,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch arm64-dts-armada-3720-turris-mox-add-missing-interru.patch pstore-ram-fix-error-return-code-in-ramoops_probe.patch arm-mmp-fix-timer_read-delay.patch diff --git a/queue-6.0/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-6.0/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 6b9ec2117c4..00000000000 --- a/queue-6.0/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 81f42ba5fcbc242b1755b08791b07c2c21599a5a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index df3c8d1d8f64..9343de6947b3 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -292,7 +292,7 @@ sata3_pins: sata-pins-3 { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -310,7 +310,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-6.0/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-6.0/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index f105ab732ae..00000000000 --- a/queue-6.0/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 582d7672f4704baaee0039fd242fee9b4b31af69 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 9525e7b7f436..9aad10fd3823 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -213,7 +213,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -227,7 +227,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index d03bf40d5cc..9d813042009 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -74,8 +74,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch arm64-dts-armada-3720-turris-mox-add-missing-interru.patch soc-apple-sart-stop-casting-function-pointer-signatu.patch soc-apple-rtkit-stop-casting-function-pointer-signat.patch diff --git a/queue-6.1/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch b/queue-6.1/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 601d9cf7d58..00000000000 --- a/queue-6.1/arm-dts-armada-38x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d3bebfc38fe230d344130b887913331bb5673762 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:27 +0200 -Subject: ARM: dts: armada-38x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d ] - -Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP -variants like Armada 370 do not support per CPU interrupts for gpios. - -So change compatible string for Armada 38x from "marvell,armada-370-gpio" -which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates -XP variant or new. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x") -Acked-by: Uwe Kleine-König -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index 446861b6b17b..12933eff419f 100644 ---- a/arch/arm/boot/dts/armada-38x.dtsi -+++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -304,7 +304,7 @@ spdif_pins: spdif-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18100 0x40>, <0x181c0 0x08>; - reg-names = "gpio", "pwm"; -@@ -323,7 +323,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,armada-370-gpio", -+ compatible = "marvell,armadaxp-gpio", - "marvell,orion-gpio"; - reg = <0x18140 0x40>, <0x181c8 0x08>; - reg-names = "gpio", "pwm"; --- -2.35.1 - diff --git a/queue-6.1/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch b/queue-6.1/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch deleted file mode 100644 index 0fd5f7b83bb..00000000000 --- a/queue-6.1/arm-dts-armada-39x-fix-compatible-string-for-gpios.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 246ddd89a315599530c5c2bff2db85b90519f2c2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 20:33:28 +0200 -Subject: ARM: dts: armada-39x: Fix compatible string for gpios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pali Rohár - -[ Upstream commit d10886a4e6f85ee18d47a1066a52168461370ded ] - -Armada 39x supports per CPU interrupts for gpios, like Armada XP. - -So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes. - -Driver gpio-mvebu.c which handles both pre-XP and XP variants already -provides support for per CPU interrupts on XP and newer variants. - -Signed-off-by: Pali Rohár -Fixes: d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's") -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 9d1cac49c022..1e05208d9f34 100644 ---- a/arch/arm/boot/dts/armada-39x.dtsi -+++ b/arch/arm/boot/dts/armada-39x.dtsi -@@ -213,7 +213,7 @@ nand_pins: nand-pins { - }; - - gpio0: gpio@18100 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18100 0x40>; - ngpios = <32>; - gpio-controller; -@@ -227,7 +227,7 @@ gpio0: gpio@18100 { - }; - - gpio1: gpio@18140 { -- compatible = "marvell,orion-gpio"; -+ compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; - reg = <0x18140 0x40>; - ngpios = <28>; - gpio-controller; --- -2.35.1 - diff --git a/queue-6.1/series b/queue-6.1/series index f23b4be5542..f52d21b298c 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -86,8 +86,6 @@ arm-dts-armada-38x-fix-assigned-addresses-for-every-.patch arm-dts-armada-39x-fix-assigned-addresses-for-every-.patch arm-dts-turris-omnia-add-ethernet-aliases.patch arm-dts-turris-omnia-add-switch-port-6-node.patch -arm-dts-armada-38x-fix-compatible-string-for-gpios.patch -arm-dts-armada-39x-fix-compatible-string-for-gpios.patch arm64-dts-armada-3720-turris-mox-add-missing-interru.patch soc-apple-sart-stop-casting-function-pointer-signatu.patch soc-apple-rtkit-stop-casting-function-pointer-signat.patch -- 2.47.3