From 20024ab7c3df4da2d446e214c7b4a61fc896bdcd Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Sat, 23 Mar 2024 22:02:56 +0100 Subject: [PATCH] mvebu: 6.6: adjust 32 bit ARM DTS path As of 6.6, all upstream DTSes are moved to their respective vendor subdir. OpenWrt already followed this practice for ARM64, but not yet for 32 bit ARM (Armada 37x/38x). Signed-off-by: Stijn Segers --- .../armada-370-buffalo-ls220de.dts | 0 .../armada-370-buffalo-ls421de.dts | 0 .../dts/{ => marvell}/armada-370-c200-v2.dts | 0 .../{ => marvell}/armada-380-iij-sa-w2.dts | 0 .../armada-385-fortinet-fg-30e.dts | 0 .../armada-385-fortinet-fg-50e.dts | 0 .../armada-385-fortinet-fg-x0e.dtsi | 0 .../armada-385-linksys-venom.dts | 0 .../dts/{ => marvell}/armada-385-nas1dual.dts | 0 .../patches-6.6/302-add_powertables.patch | 24 +++++++++---------- .../patches-6.6/304-revert_i2c_delay.patch | 4 ++-- .../305-armada-385-rd-mtd-partitions.patch | 4 ++-- .../306-ARM-mvebu-385-ap-Add-partitions.patch | 6 ++--- ...-armada-xp-linksys-mamba-broken-idle.patch | 4 ++-- .../308-armada-xp-linksys-mamba-wan.patch | 4 ++-- .../patches-6.6/309-linksys-status-led.patch | 8 +++---- .../310-linksys-use-eth0-as-cpu-port.patch | 4 ++-- .../311-adjust-compatible-for-linksys.patch | 20 ++++++++-------- ...da388-clearfog-emmc-on-clearfog-base.patch | 10 ++++---- .../313-helios4-dts-status-led-alias.patch | 4 ++-- ...rmada-xp-linksys-mamba-resize-kernel.patch | 6 ++--- ...316-armada-370-dts-fix-crypto-engine.patch | 4 ++-- ...armada-370-synology-ds213j-mtd-parts.patch | 4 ++-- 23 files changed, 53 insertions(+), 53 deletions(-) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-370-buffalo-ls220de.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-370-buffalo-ls421de.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-370-c200-v2.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-380-iij-sa-w2.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-385-fortinet-fg-30e.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-385-fortinet-fg-50e.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-385-fortinet-fg-x0e.dtsi (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-385-linksys-venom.dts (100%) rename target/linux/mvebu/files-6.6/arch/arm/boot/dts/{ => marvell}/armada-385-nas1dual.dts (100%) diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls220de.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls220de.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls421de.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls421de.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-c200-v2.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-c200-v2.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-c200-v2.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-c200-v2.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-380-iij-sa-w2.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-380-iij-sa-w2.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-380-iij-sa-w2.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-380-iij-sa-w2.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-30e.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-30e.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-50e.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-50e.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-x0e.dtsi similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-x0e.dtsi diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-linksys-venom.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-linksys-venom.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-linksys-venom.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-linksys-venom.dts diff --git a/target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-nas1dual.dts b/target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-nas1dual.dts similarity index 100% rename from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-nas1dual.dts rename to target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-nas1dual.dts diff --git a/target/linux/mvebu/patches-6.6/302-add_powertables.patch b/target/linux/mvebu/patches-6.6/302-add_powertables.patch index d0c0dbeb0c..36117d0cd1 100644 --- a/target/linux/mvebu/patches-6.6/302-add_powertables.patch +++ b/target/linux/mvebu/patches-6.6/302-add_powertables.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-385-linksys.dtsi -+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +--- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi @@ -214,11 +214,19 @@ &pcie1 { /* Marvell 88W8864, 5GHz-only */ @@ -20,8 +20,8 @@ }; &pinctrl { ---- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts @@ -142,3 +142,205 @@ }; }; @@ -228,8 +228,8 @@ + }; + }; +}; ---- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts @@ -142,3 +142,205 @@ }; }; @@ -436,8 +436,8 @@ + }; + }; +}; ---- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts @@ -142,3 +142,205 @@ }; }; @@ -644,8 +644,8 @@ + }; + }; +}; ---- a/arch/arm/boot/dts/armada-385-linksys-rango.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts @@ -157,6 +157,18 @@ }; }; @@ -665,8 +665,8 @@ &sdhci { pinctrl-names = "default"; pinctrl-0 = <&sdhci_pins>; ---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -223,12 +223,100 @@ pcie@2,0 { /* Port 0, Lane 1 */ diff --git a/target/linux/mvebu/patches-6.6/304-revert_i2c_delay.patch b/target/linux/mvebu/patches-6.6/304-revert_i2c_delay.patch index 930c0f9494..3802b0f16e 100644 --- a/target/linux/mvebu/patches-6.6/304-revert_i2c_delay.patch +++ b/target/linux/mvebu/patches-6.6/304-revert_i2c_delay.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-xp.dtsi -+++ b/arch/arm/boot/dts/armada-xp.dtsi +--- a/arch/arm/boot/dts/marvell/armada-xp.dtsi ++++ b/arch/arm/boot/dts/marvell/armada-xp.dtsi @@ -237,12 +237,10 @@ }; diff --git a/target/linux/mvebu/patches-6.6/305-armada-385-rd-mtd-partitions.patch b/target/linux/mvebu/patches-6.6/305-armada-385-rd-mtd-partitions.patch index 31bd53b1f3..6fd4fa0e20 100644 --- a/target/linux/mvebu/patches-6.6/305-armada-385-rd-mtd-partitions.patch +++ b/target/linux/mvebu/patches-6.6/305-armada-385-rd-mtd-partitions.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-388-rd.dts -+++ b/arch/arm/boot/dts/armada-388-rd.dts +--- a/arch/arm/boot/dts/marvell/armada-388-rd.dts ++++ b/arch/arm/boot/dts/marvell/armada-388-rd.dts @@ -103,6 +103,16 @@ compatible = "st,m25p128", "jedec,spi-nor"; reg = <0>; /* Chip select 0 */ diff --git a/target/linux/mvebu/patches-6.6/306-ARM-mvebu-385-ap-Add-partitions.patch b/target/linux/mvebu/patches-6.6/306-ARM-mvebu-385-ap-Add-partitions.patch index aee033d21f..fbdab2fb94 100644 --- a/target/linux/mvebu/patches-6.6/306-ARM-mvebu-385-ap-Add-partitions.patch +++ b/target/linux/mvebu/patches-6.6/306-ARM-mvebu-385-ap-Add-partitions.patch @@ -5,11 +5,11 @@ Subject: [PATCH 2/2] ARM: mvebu: 385-ap: Add partitions Signed-off-by: Maxime Ripard --- - arch/arm/boot/dts/armada-385-db-ap.dts | 6 +++--- + arch/arm/boot/dts/marvell/armada-385-db-ap.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---- a/arch/arm/boot/dts/armada-385-db-ap.dts -+++ b/arch/arm/boot/dts/armada-385-db-ap.dts +--- a/arch/arm/boot/dts/marvell/armada-385-db-ap.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-db-ap.dts @@ -218,19 +218,19 @@ #size-cells = <1>; diff --git a/target/linux/mvebu/patches-6.6/307-armada-xp-linksys-mamba-broken-idle.patch b/target/linux/mvebu/patches-6.6/307-armada-xp-linksys-mamba-broken-idle.patch index fc6d6239ca..b801b54435 100644 --- a/target/linux/mvebu/patches-6.6/307-armada-xp-linksys-mamba-broken-idle.patch +++ b/target/linux/mvebu/patches-6.6/307-armada-xp-linksys-mamba-broken-idle.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -483,3 +483,7 @@ }; }; diff --git a/target/linux/mvebu/patches-6.6/308-armada-xp-linksys-mamba-wan.patch b/target/linux/mvebu/patches-6.6/308-armada-xp-linksys-mamba-wan.patch index 389e03742e..5d8c5811b6 100644 --- a/target/linux/mvebu/patches-6.6/308-armada-xp-linksys-mamba-wan.patch +++ b/target/linux/mvebu/patches-6.6/308-armada-xp-linksys-mamba-wan.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -385,7 +385,7 @@ port@4 { diff --git a/target/linux/mvebu/patches-6.6/309-linksys-status-led.patch b/target/linux/mvebu/patches-6.6/309-linksys-status-led.patch index 0ef15f2943..4cbc2787b2 100644 --- a/target/linux/mvebu/patches-6.6/309-linksys-status-led.patch +++ b/target/linux/mvebu/patches-6.6/309-linksys-status-led.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-385-linksys.dtsi -+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +--- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi @@ -14,6 +14,13 @@ compatible = "linksys,armada385", "marvell,armada385", "marvell,armada380"; @@ -23,8 +23,8 @@ gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; default-state = "on"; }; ---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -26,6 +26,13 @@ compatible = "linksys,mamba", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; diff --git a/target/linux/mvebu/patches-6.6/310-linksys-use-eth0-as-cpu-port.patch b/target/linux/mvebu/patches-6.6/310-linksys-use-eth0-as-cpu-port.patch index 84d49a004b..8136646671 100644 --- a/target/linux/mvebu/patches-6.6/310-linksys-use-eth0-as-cpu-port.patch +++ b/target/linux/mvebu/patches-6.6/310-linksys-use-eth0-as-cpu-port.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-385-linksys.dtsi -+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +--- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi @@ -116,7 +116,7 @@ }; diff --git a/target/linux/mvebu/patches-6.6/311-adjust-compatible-for-linksys.patch b/target/linux/mvebu/patches-6.6/311-adjust-compatible-for-linksys.patch index a5d3e63810..6722248df7 100644 --- a/target/linux/mvebu/patches-6.6/311-adjust-compatible-for-linksys.patch +++ b/target/linux/mvebu/patches-6.6/311-adjust-compatible-for-linksys.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-385-linksys-rango.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts @@ -12,8 +12,8 @@ / { @@ -11,8 +11,8 @@ }; &expander0 { ---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -22,9 +22,10 @@ #include "armada-xp-mv78230.dtsi" @@ -27,8 +27,8 @@ aliases { led-boot = &led_power; ---- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts @@ -9,8 +9,9 @@ #include "armada-385-linksys.dtsi" @@ -41,8 +41,8 @@ "marvell,armada380"; }; ---- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts @@ -10,8 +10,8 @@ / { @@ -54,8 +54,8 @@ }; &expander0 { ---- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts -+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts +--- a/arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts ++++ b/arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts @@ -10,7 +10,8 @@ / { diff --git a/target/linux/mvebu/patches-6.6/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch b/target/linux/mvebu/patches-6.6/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch index f52417e83a..5f84a34769 100644 --- a/target/linux/mvebu/patches-6.6/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch +++ b/target/linux/mvebu/patches-6.6/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch @@ -5,13 +5,13 @@ Subject: ARM: dts: armada388-clearfog: emmc on clearfog base Signed-off-by: Russell King --- - .../arm/boot/dts/armada-388-clearfog-base.dts | 1 + + .../arm/boot/dts/marvell/armada-388-clearfog-base.dts | 1 + .../armada-38x-solidrun-microsom-emmc.dtsi | 62 +++++++++++++++++++ 2 files changed, 63 insertions(+) - create mode 100644 arch/arm/boot/dts/armada-38x-solidrun-microsom-emmc.dtsi + create mode 100644 arch/arm/boot/dts/marvell/armada-38x-solidrun-microsom-emmc.dtsi ---- a/arch/arm/boot/dts/armada-388-clearfog-base.dts -+++ b/arch/arm/boot/dts/armada-388-clearfog-base.dts +--- a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts ++++ b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts @@ -7,6 +7,7 @@ /dts-v1/; @@ -21,7 +21,7 @@ Signed-off-by: Russell King / { model = "SolidRun Clearfog Base A1"; --- /dev/null -+++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom-emmc.dtsi ++++ b/arch/arm/boot/dts/marvell/armada-38x-solidrun-microsom-emmc.dtsi @@ -0,0 +1,62 @@ +/* + * Device Tree file for SolidRun Armada 38x Microsom add-on for eMMC diff --git a/target/linux/mvebu/patches-6.6/313-helios4-dts-status-led-alias.patch b/target/linux/mvebu/patches-6.6/313-helios4-dts-status-led-alias.patch index 607f436297..50b970aabb 100644 --- a/target/linux/mvebu/patches-6.6/313-helios4-dts-status-led-alias.patch +++ b/target/linux/mvebu/patches-6.6/313-helios4-dts-status-led-alias.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-388-helios4.dts -+++ b/arch/arm/boot/dts/armada-388-helios4.dts +--- a/arch/arm/boot/dts/marvell/armada-388-helios4.dts ++++ b/arch/arm/boot/dts/marvell/armada-388-helios4.dts @@ -15,6 +15,13 @@ model = "Helios4"; compatible = "kobol,helios4", "marvell,armada388", diff --git a/target/linux/mvebu/patches-6.6/315-armada-xp-linksys-mamba-resize-kernel.patch b/target/linux/mvebu/patches-6.6/315-armada-xp-linksys-mamba-resize-kernel.patch index c333df2784..d36fe7441c 100644 --- a/target/linux/mvebu/patches-6.6/315-armada-xp-linksys-mamba-resize-kernel.patch +++ b/target/linux/mvebu/patches-6.6/315-armada-xp-linksys-mamba-resize-kernel.patch @@ -6,11 +6,11 @@ Subject: [PATCH] ARM: dts: armada-xp-linksys-mamba: Increase kernel Signed-off-by: Tad Davanzo --- - arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 8 ++++---- + arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -454,9 +454,9 @@ reg = <0xa00000 0x2800000>; /* 40MB */ }; diff --git a/target/linux/mvebu/patches-6.6/316-armada-370-dts-fix-crypto-engine.patch b/target/linux/mvebu/patches-6.6/316-armada-370-dts-fix-crypto-engine.patch index b5ed5ece36..653c2b0a18 100644 --- a/target/linux/mvebu/patches-6.6/316-armada-370-dts-fix-crypto-engine.patch +++ b/target/linux/mvebu/patches-6.6/316-armada-370-dts-fix-crypto-engine.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-370.dtsi -+++ b/arch/arm/boot/dts/armada-370.dtsi +--- a/arch/arm/boot/dts/marvell/armada-370.dtsi ++++ b/arch/arm/boot/dts/marvell/armada-370.dtsi @@ -254,7 +254,7 @@ clocks = <&gateclk 23>; clock-names = "cesa0"; diff --git a/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch b/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch index 280fc5957e..0699a47765 100644 --- a/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch +++ b/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts -+++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts +--- a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts ++++ b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts @@ -31,6 +31,7 @@ chosen { -- 2.30.2