mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-18 10:46:41 +00:00
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 <foss@volatilesystems.org>
This commit is contained in:
parent
4671a92de3
commit
20024ab7c3
@ -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 */
|
||||
|
@ -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 @@
|
||||
};
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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>;
|
||||
|
||||
|
@ -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 @@
|
||||
};
|
||||
};
|
||||
|
@ -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 {
|
||||
|
@ -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";
|
||||
|
@ -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 @@
|
||||
};
|
||||
|
||||
|
@ -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 @@
|
||||
|
||||
/ {
|
||||
|
@ -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
|
||||
|
@ -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",
|
||||
|
@ -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 */
|
||||
};
|
||||
|
@ -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";
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user