]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
mvebu: 6.6: adjust 32 bit ARM DTS path
authorStijn Segers <foss@volatilesystems.org>
Sat, 23 Mar 2024 21:02:56 +0000 (22:02 +0100)
committerRobert Marko <robimarko@gmail.com>
Wed, 3 Apr 2024 15:49:53 +0000 (17:49 +0200)
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>
23 files changed:
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls220de.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-buffalo-ls421de.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-370-c200-v2.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-370-c200-v2.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-380-iij-sa-w2.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-380-iij-sa-w2.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-30e.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-50e.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-fortinet-fg-x0e.dtsi [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-linksys-venom.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-linksys-venom.dts with 100% similarity]
target/linux/mvebu/files-6.6/arch/arm/boot/dts/marvell/armada-385-nas1dual.dts [moved from target/linux/mvebu/files-6.6/arch/arm/boot/dts/armada-385-nas1dual.dts with 100% similarity]
target/linux/mvebu/patches-6.6/302-add_powertables.patch
target/linux/mvebu/patches-6.6/304-revert_i2c_delay.patch
target/linux/mvebu/patches-6.6/305-armada-385-rd-mtd-partitions.patch
target/linux/mvebu/patches-6.6/306-ARM-mvebu-385-ap-Add-partitions.patch
target/linux/mvebu/patches-6.6/307-armada-xp-linksys-mamba-broken-idle.patch
target/linux/mvebu/patches-6.6/308-armada-xp-linksys-mamba-wan.patch
target/linux/mvebu/patches-6.6/309-linksys-status-led.patch
target/linux/mvebu/patches-6.6/310-linksys-use-eth0-as-cpu-port.patch
target/linux/mvebu/patches-6.6/311-adjust-compatible-for-linksys.patch
target/linux/mvebu/patches-6.6/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
target/linux/mvebu/patches-6.6/313-helios4-dts-status-led-alias.patch
target/linux/mvebu/patches-6.6/315-armada-xp-linksys-mamba-resize-kernel.patch
target/linux/mvebu/patches-6.6/316-armada-370-dts-fix-crypto-engine.patch
target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch

index d0c0dbeb0cb5d2ee232d6060ea576cd798547e05..36117d0cd12868104c4ffdbdf95de07fe6626881 100644 (file)
@@ -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 @@
                };
        };
 +              };
 +      };
 +};
---- 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 @@
                };
        };
 +              };
 +      };
 +};
---- 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 @@
                };
        };
 +              };
 +      };
 +};
---- 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 @@
        };
  };
  &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 */
index 930c0f94942b6bd7a1dcfa819cb40b23655b6817..3802b0f16edbcd1950606237ed077e9f2443c60e 100644 (file)
@@ -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 @@
  };
  
index 31bd53b1f3be828b23e9f4bc92cfc59c2ffccdf3..6fd4fa0e201ca01775868ace844c0a46fd7fd4e9 100644 (file)
@@ -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 */
index aee033d21fc448ea13c599b019ac703179d7d71f..fbdab2fb949f4d7daf71d7c87a0a52828f72c22b 100644 (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>
 ---
- 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>;
  
index fc6d6239ca40b48992bd27acf8c6c61965a42702..b801b54435a5c46ebb7333e37548aad1a6fa1069 100644 (file)
@@ -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 @@
                };
        };
index 389e03742e2f67b688bb875e3972fb19fbbfaa3e..5d8c5811b62be4a5ff9df2b8616e70440e93ff44 100644 (file)
@@ -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 {
index 0ef15f2943f2ba7f0e8ed394f2ea792634e9e566..4cbc2787b2109ac4d274cebc27db1fc7635931d5 100644 (file)
@@ -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";
index 84d49a004b85b32ca2189a9b19ed91c0d843a019..8136646671a2bc2754c737fe9e8769bf6b9c2941 100644 (file)
@@ -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 @@
  };
  
index a5d3e6381064e55a7e0f70ff63944cfcb8c26eb2..6722248df79593f50fc76a09756f897620f9052b 100644 (file)
@@ -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 @@
  
  / {
index f52417e83a7dbba34276a9dc6725713792cd0045..5f84a34769b42d282d9b105da6d98102117dee33 100644 (file)
@@ -5,13 +5,13 @@ Subject: ARM: dts: armada388-clearfog: emmc on clearfog base
 
 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 +++++++++++++++++++
  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 <rmk+kernel@armlinux.org.uk>
  / {
        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
index 607f436297126d9af9613ac42314742d157b4880..50b970aabb134f8846395e898ad20382e5bc0060 100644 (file)
@@ -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",
index c333df2784252bfd0dc1c67e8f21e68469c1783a..d36fe7441cca180587a83bb704ef01f90673d618 100644 (file)
@@ -6,11 +6,11 @@ Subject: [PATCH] ARM: dts: armada-xp-linksys-mamba: Increase kernel
 
 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(-)
 
---- 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 */
                        };
index b5ed5ece36918f2ee2a7850b60ddcab74673a8fe..653c2b0a18285e034048f044b2f1b83aa1ca12ec 100644 (file)
@@ -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";
index 280fc5957e49ce8552d86ec75540595e631fa46d..0699a47765b110b0bcb002335ed79ae275719631 100644 (file)
@@ -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 {