mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
167 lines
3.7 KiB
Diff
167 lines
3.7 KiB
Diff
From 438e53828c08cf0e8a65b61cf6ce1e4b6620551a Mon Sep 17 00:00:00 2001
|
|
From: Sam Shih <sam.shih@mediatek.com>
|
|
Date: Sun, 6 Nov 2022 09:50:24 +0100
|
|
Subject: [PATCH 02/19] arm64: dts: mt7986: harmonize device node order
|
|
|
|
This arrange device tree nodes in alphabetical order.
|
|
|
|
Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Link: https://lore.kernel.org/r/20221106085034.12582-2-linux@fw-web.de
|
|
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 94 ++++++++++----------
|
|
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 22 ++---
|
|
2 files changed, 58 insertions(+), 58 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
|
|
@@ -54,6 +54,53 @@
|
|
};
|
|
};
|
|
|
|
+&pio {
|
|
+ uart1_pins: uart1-pins {
|
|
+ mux {
|
|
+ function = "uart";
|
|
+ groups = "uart1";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ uart2_pins: uart2-pins {
|
|
+ mux {
|
|
+ function = "uart";
|
|
+ groups = "uart2";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ wf_2g_5g_pins: wf-2g-5g-pins {
|
|
+ mux {
|
|
+ function = "wifi";
|
|
+ groups = "wf_2g", "wf_5g";
|
|
+ };
|
|
+ conf {
|
|
+ pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
|
|
+ "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
|
|
+ "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
|
|
+ "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
|
|
+ "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
|
|
+ "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
|
|
+ "WF1_TOP_CLK", "WF1_TOP_DATA";
|
|
+ drive-strength = <4>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ wf_dbdc_pins: wf-dbdc-pins {
|
|
+ mux {
|
|
+ function = "wifi";
|
|
+ groups = "wf_dbdc";
|
|
+ };
|
|
+ conf {
|
|
+ pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
|
|
+ "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
|
|
+ "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
|
|
+ "WF0_TOP_CLK", "WF0_TOP_DATA";
|
|
+ drive-strength = <4>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
&switch {
|
|
ports {
|
|
#address-cells = <1>;
|
|
@@ -121,50 +168,3 @@
|
|
pinctrl-0 = <&wf_2g_5g_pins>;
|
|
pinctrl-1 = <&wf_dbdc_pins>;
|
|
};
|
|
-
|
|
-&pio {
|
|
- uart1_pins: uart1-pins {
|
|
- mux {
|
|
- function = "uart";
|
|
- groups = "uart1";
|
|
- };
|
|
- };
|
|
-
|
|
- uart2_pins: uart2-pins {
|
|
- mux {
|
|
- function = "uart";
|
|
- groups = "uart2";
|
|
- };
|
|
- };
|
|
-
|
|
- wf_2g_5g_pins: wf-2g-5g-pins {
|
|
- mux {
|
|
- function = "wifi";
|
|
- groups = "wf_2g", "wf_5g";
|
|
- };
|
|
- conf {
|
|
- pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
|
|
- "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
|
|
- "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
|
|
- "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
|
|
- "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
|
|
- "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
|
|
- "WF1_TOP_CLK", "WF1_TOP_DATA";
|
|
- drive-strength = <4>;
|
|
- };
|
|
- };
|
|
-
|
|
- wf_dbdc_pins: wf-dbdc-pins {
|
|
- mux {
|
|
- function = "wifi";
|
|
- groups = "wf_dbdc";
|
|
- };
|
|
- conf {
|
|
- pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
|
|
- "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
|
|
- "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
|
|
- "WF0_TOP_CLK", "WF0_TOP_DATA";
|
|
- drive-strength = <4>;
|
|
- };
|
|
- };
|
|
-};
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
|
|
@@ -25,10 +25,6 @@
|
|
};
|
|
};
|
|
|
|
-&uart0 {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
ð {
|
|
status = "okay";
|
|
|
|
@@ -99,13 +95,6 @@
|
|
};
|
|
};
|
|
|
|
-&wifi {
|
|
- status = "okay";
|
|
- pinctrl-names = "default", "dbdc";
|
|
- pinctrl-0 = <&wf_2g_5g_pins>;
|
|
- pinctrl-1 = <&wf_dbdc_pins>;
|
|
-};
|
|
-
|
|
&pio {
|
|
wf_2g_5g_pins: wf-2g-5g-pins {
|
|
mux {
|
|
@@ -138,3 +127,14 @@
|
|
};
|
|
};
|
|
};
|
|
+
|
|
+&uart0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&wifi {
|
|
+ status = "okay";
|
|
+ pinctrl-names = "default", "dbdc";
|
|
+ pinctrl-0 = <&wf_2g_5g_pins>;
|
|
+ pinctrl-1 = <&wf_dbdc_pins>;
|
|
+};
|