Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mvebu: 6.6: adjust 32 bit ARM DTS path

Browse source 
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 <foss@volatilesystems.org>
This commit is contained in:
Stijn Segers 2024-03-23 22:02:56 +01:00 committed by Robert Marko
parent 4671a92de3
commit 20024ab7c3
23 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls220de.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls421de.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-c200-v2.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-c200-v2.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-380-iij-sa-w2.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-380-iij-sa-w2.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-30e.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-50e.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-x0e.dtsi
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-linksys-venom.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-linksys-venom.dts
View file

0
target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-nas1dual.dts → target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-nas1dual.dts
View file

24
target/linux/mvebu/patches-6.6/302-add_powertables.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi --- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
@@ -214,11 +214,19 @@ @@ -214,11 +214,19 @@
&pcie1 { &pcie1 {
/* Marvell 88W8864, 5GHz-only */ /* Marvell 88W8864, 5GHz-only */
@ -20,8 +20,8 @@
}; };
&pinctrl { &pinctrl {
--- a/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/armada-385-linksys-caiman.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts
@@ -142,3 +142,205 @@ @@ -142,3 +142,205 @@
}; };
}; };
@ -228,8 +228,8 @@
+ }; + };
+ }; + };
+}; +};
--- a/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/armada-385-linksys-cobra.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts
@@ -142,3 +142,205 @@ @@ -142,3 +142,205 @@
}; };
}; };
@ -436,8 +436,8 @@
+ }; + };
+ }; + };
+}; +};
--- a/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/armada-385-linksys-shelby.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts
@@ -142,3 +142,205 @@ @@ -142,3 +142,205 @@
}; };
}; };
@ -644,8 +644,8 @@
+ }; + };
+ }; + };
+}; +};
--- a/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/armada-385-linksys-rango.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts
@@ -157,6 +157,18 @@ @@ -157,6 +157,18 @@
}; };
}; };
@ -665,8 +665,8 @@
&sdhci { &sdhci {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdhci_pins>; pinctrl-0 = <&sdhci_pins>;
--- a/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/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -223,12 +223,100 @@ @@ -223,12 +223,100 @@
pcie@2,0 { pcie@2,0 {
/* Port 0, Lane 1 */ /* Port 0, Lane 1 */

4
target/linux/mvebu/patches-6.6/304-revert_i2c_delay.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-xp.dtsi --- a/arch/arm/boot/dts/marvell/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/marvell/armada-xp.dtsi
@@ -237,12 +237,10 @@ @@ -237,12 +237,10 @@
}; };

4
target/linux/mvebu/patches-6.6/305-armada-385-rd-mtd-partitions.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-388-rd.dts --- a/arch/arm/boot/dts/marvell/armada-388-rd.dts
+++ b/arch/arm/boot/dts/armada-388-rd.dts +++ b/arch/arm/boot/dts/marvell/armada-388-rd.dts
@@ -103,6 +103,16 @@ @@ -103,6 +103,16 @@
compatible = "st,m25p128", "jedec,spi-nor"; compatible = "st,m25p128", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */ reg = <0>; /* Chip select 0 */

6
target/linux/mvebu/patches-6.6/306-ARM-mvebu-385-ap-Add-partitions.patch
View file

@ -5,11 +5,11 @@ Subject: [PATCH 2/2] ARM: mvebu: 385-ap: Add partitions
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
--- ---
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(-) 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/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/armada-385-db-ap.dts +++ b/arch/arm/boot/dts/marvell/armada-385-db-ap.dts
@@ -218,19 +218,19 @@ @@ -218,19 +218,19 @@
#size-cells = <1>; #size-cells = <1>;

4
target/linux/mvebu/patches-6.6/307-armada-xp-linksys-mamba-broken-idle.patch
View file

@ -1,5 +1,5 @@
--- a/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/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -483,3 +483,7 @@ @@ -483,3 +483,7 @@
}; };
}; };

4
target/linux/mvebu/patches-6.6/308-armada-xp-linksys-mamba-wan.patch
View file

@ -1,5 +1,5 @@
--- a/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/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -385,7 +385,7 @@ @@ -385,7 +385,7 @@
port@4 { port@4 {

8
target/linux/mvebu/patches-6.6/309-linksys-status-led.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi --- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
@@ -14,6 +14,13 @@ @@ -14,6 +14,13 @@
compatible = "linksys,armada385", "marvell,armada385", compatible = "linksys,armada385", "marvell,armada385",
"marvell,armada380"; "marvell,armada380";
@ -23,8 +23,8 @@
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
}; };
--- a/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/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -26,6 +26,13 @@ @@ -26,6 +26,13 @@
compatible = "linksys,mamba", "marvell,armadaxp-mv78230", compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
"marvell,armadaxp", "marvell,armada-370-xp"; "marvell,armadaxp", "marvell,armada-370-xp";

4
target/linux/mvebu/patches-6.6/310-linksys-use-eth0-as-cpu-port.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi --- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
}; };

20
target/linux/mvebu/patches-6.6/311-adjust-compatible-for-linksys.patch
View file

@ -1,5 +1,5 @@
--- a/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/armada-385-linksys-rango.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
/ { / {
@ -11,8 +11,8 @@
}; };
&expander0 { &expander0 {
--- a/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/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -22,9 +22,10 @@ @@ -22,9 +22,10 @@
#include "armada-xp-mv78230.dtsi" #include "armada-xp-mv78230.dtsi"
@ -27,8 +27,8 @@
aliases { aliases {
led-boot = &led_power; led-boot = &led_power;
--- a/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/armada-385-linksys-cobra.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts
@@ -9,8 +9,9 @@ @@ -9,8 +9,9 @@
#include "armada-385-linksys.dtsi" #include "armada-385-linksys.dtsi"
@ -41,8 +41,8 @@
"marvell,armada380"; "marvell,armada380";
}; };
--- a/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/armada-385-linksys-caiman.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
/ { / {
@ -54,8 +54,8 @@
}; };
&expander0 { &expander0 {
--- a/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/armada-385-linksys-shelby.dts +++ b/arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts
@@ -10,7 +10,8 @@ @@ -10,7 +10,8 @@
/ { / {

10
target/linux/mvebu/patches-6.6/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
View file

@ -5,13 +5,13 @@ Subject: ARM: dts: armada388-clearfog: emmc on clearfog base
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- ---
.../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 +++++++++++++++++++ .../armada-38x-solidrun-microsom-emmc.dtsi | 62 +++++++++++++++++++
2 files changed, 63 insertions(+) 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 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog-base.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
/dts-v1/; /dts-v1/;
@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/ { / {
model = "SolidRun Clearfog Base A1"; model = "SolidRun Clearfog Base A1";
--- /dev/null --- /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 @@ @@ -0,0 +1,62 @@
+/* +/*
+ * Device Tree file for SolidRun Armada 38x Microsom add-on for eMMC + * Device Tree file for SolidRun Armada 38x Microsom add-on for eMMC

4
target/linux/mvebu/patches-6.6/313-helios4-dts-status-led-alias.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-388-helios4.dts --- a/arch/arm/boot/dts/marvell/armada-388-helios4.dts
+++ b/arch/arm/boot/dts/armada-388-helios4.dts +++ b/arch/arm/boot/dts/marvell/armada-388-helios4.dts
@@ -15,6 +15,13 @@ @@ -15,6 +15,13 @@
model = "Helios4"; model = "Helios4";
compatible = "kobol,helios4", "marvell,armada388", compatible = "kobol,helios4", "marvell,armada388",

6
target/linux/mvebu/patches-6.6/315-armada-xp-linksys-mamba-resize-kernel.patch
View file

@ -6,11 +6,11 @@ Subject: [PATCH] ARM: dts: armada-xp-linksys-mamba: Increase kernel
Signed-off-by: Tad Davanzo <tad@spotco.us> Signed-off-by: Tad Davanzo <tad@spotco.us>
--- ---
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(-) 1 file changed, 4 insertions(+), 4 deletions(-)
--- a/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/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -454,9 +454,9 @@ @@ -454,9 +454,9 @@
reg = <0xa00000 0x2800000>; /* 40MB */ reg = <0xa00000 0x2800000>; /* 40MB */
}; };

4
target/linux/mvebu/patches-6.6/316-armada-370-dts-fix-crypto-engine.patch
View file

@ -1,5 +1,5 @@
--- a/arch/arm/boot/dts/armada-370.dtsi --- a/arch/arm/boot/dts/marvell/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/marvell/armada-370.dtsi
@@ -254,7 +254,7 @@ @@ -254,7 +254,7 @@
clocks = <&gateclk 23>; clocks = <&gateclk 23>;
clock-names = "cesa0"; clock-names = "cesa0";

4
target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
View file

@ -1,5 +1,5 @@
--- a/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/armada-370-synology-ds213j.dts +++ b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
chosen { chosen {