[openwrt/openwrt] mediatek: filogic: Zyxel EX5601-T0 dts cleanup
LEDE Commits
lede-commits at lists.infradead.org
Wed Sep 10 15:12:15 PDT 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/5c57477358435ff2ca871bba833e3ef9e80c8bee
commit 5c57477358435ff2ca871bba833e3ef9e80c8bee
Author: Paweł Owoc <frut3k7 at gmail.com>
AuthorDate: Sat Sep 6 20:49:04 2025 +0200
mediatek: filogic: Zyxel EX5601-T0 dts cleanup
Dts cleanup for Zyxel EX5601:
- duplicated code
- trailing zeros and whitespaces
Signed-off-by: Paweł Owoc <frut3k7 at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19968
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../dts/mt7986a-zyxel-ex5601-t0-common.dtsi | 35 ++++++++++------
.../mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts | 47 ++++++----------------
.../dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts | 45 +++++----------------
3 files changed, 45 insertions(+), 82 deletions(-)
diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
index fbc4dcfb50..f0f3106081 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
@@ -4,12 +4,13 @@
* Author: Sam.Shih <sam.shih at mediatek.com>
*/
-#include "mt7986a.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/mt65xx.h>
+#include "mt7986a.dtsi"
+
/ {
aliases {
serial0 = &uart0;
@@ -192,6 +193,9 @@
reg = <0>;
phy-mode = "2500base-x";
+ nvmem-cells = <&macaddr_factory_2a 0>;
+ nvmem-cell-names = "mac-address";
+
fixed-link {
speed = <2500>;
full-duplex;
@@ -204,6 +208,9 @@
reg = <1>;
phy-mode = "2500base-x";
phy = <&phy6>;
+
+ nvmem-cells = <&macaddr_factory_24 0>;
+ nvmem-cell-names = "mac-address";
};
mdio: mdio-bus {
@@ -301,6 +308,8 @@
pinctrl-names = "default", "dbdc";
pinctrl-0 = <&wf_2g_5g_pins>;
pinctrl-1 = <&wf_dbdc_pins>;
+ nvmem-cells = <&eeprom_factory>;
+ nvmem-cell-names = "eeprom";
};
&crypto {
@@ -367,12 +376,12 @@
};
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";
+ "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 = <MTK_DRIVE_4mA>;
};
};
@@ -384,12 +393,12 @@
};
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";
+ "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 = <MTK_DRIVE_4mA>;
};
};
diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
index 587a05e45e..fa64c1f487 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
@@ -5,19 +5,11 @@
*/
/dts-v1/;
-#include "mt7986a.dtsi"
#include "mt7986a-zyxel-ex5601-t0-common.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
/ {
model = "Zyxel EX5601-T0 (stock layout)";
compatible = "zyxel,ex5601-t0-stock", "mediatek,mt7986a";
-
- memory at 40000000 {
- device_type = "memory";
- reg = <0 0x40000000 0 0x20000000>;
- };
};
&spi_nand {
@@ -30,18 +22,18 @@
partition at 0 {
label = "BL2";
- reg = <0x00000 0x0100000>;
+ reg = <0x0 0x100000>;
read-only;
};
partition at 100000 {
label = "u-boot-env";
- reg = <0x0100000 0x0080000>;
+ reg = <0x100000 0x80000>;
};
factory: partition at 180000 {
label = "Factory";
- reg = <0x180000 0x0200000>;
+ reg = <0x180000 0x200000>;
read-only;
nvmem-layout {
@@ -54,21 +46,21 @@
reg = <0x0 0x1000>;
};
- macaddr_factory_0004: macaddr at 4 {
+ macaddr_factory_4: macaddr at 4 {
compatible = "mac-base";
- reg = <0x0004 0x6>;
+ reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
};
- macaddr_factory_0024: macaddr at 24 {
+ macaddr_factory_24: macaddr at 24 {
compatible = "mac-base";
- reg = <0x0024 0x6>;
+ reg = <0x24 0x6>;
#nvmem-cell-cells = <1>;
};
- macaddr_factory_002a: macaddr at 2a {
+ macaddr_factory_2a: macaddr at 2a {
compatible = "mac-base";
- reg = <0x002a 0x6>;
+ reg = <0x2a 0x6>;
#nvmem-cell-cells = <1>;
};
};
@@ -76,13 +68,13 @@
partition at 380000 {
label = "FIP";
- reg = <0x380000 0x01C0000>;
+ reg = <0x380000 0x1c0000>;
read-only;
};
partition at 540000 {
label = "zloader";
- reg = <0x540000 0x0040000>;
+ reg = <0x540000 0x40000>;
read-only;
};
@@ -99,21 +91,6 @@
partition at 8580000 {
label = "zyubi";
- reg = <0x8580000 0x15A80000>;
+ reg = <0x8580000 0x15a80000>;
};
};
-
-&gmac0 {
- nvmem-cells = <&macaddr_factory_002a 0>;
- nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
- nvmem-cells = <&macaddr_factory_0024 0>;
- nvmem-cell-names = "mac-address";
-};
-
-&wifi {
- nvmem-cells = <&eeprom_factory>;
- nvmem-cell-names = "eeprom";
-};
diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
index f715a06312..5fb6c66ea1 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
@@ -5,20 +5,12 @@
*/
/dts-v1/;
-#include "mt7986a.dtsi"
#include "mt7986a-zyxel-ex5601-t0-common.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
/ {
model = "Zyxel EX5601-T0 ubootmod";
compatible = "zyxel,ex5601-t0-ubootmod", "mediatek,mt7986a";
- memory at 40000000 {
- device_type = "memory";
- reg = <0 0x40000000 0 0x20000000>;
- };
-
chosen {
bootargs-append = " root=/dev/fit0 rootwait";
rootdisk = <&ubi_rootdisk>;
@@ -34,13 +26,13 @@
partition at 100000 {
label = "u-boot-env";
- reg = <0x0100000 0x0080000>;
+ reg = <0x100000 0x80000>;
read-only;
};
factory: partition at 180000 {
- label = "Factory";
- reg = <0x180000 0x0200000>;
+ label = "factory";
+ reg = <0x180000 0x200000>;
read-only;
nvmem-layout {
@@ -53,21 +45,21 @@
reg = <0x0 0x1000>;
};
- macaddr_factory_0004: macaddr at 4 {
+ macaddr_factory_4: macaddr at 4 {
compatible = "mac-base";
- reg = <0x0004 0x6>;
+ reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
};
- macaddr_factory_0024: macaddr at 24 {
+ macaddr_factory_24: macaddr at 24 {
compatible = "mac-base";
- reg = <0x0024 0x6>;
+ reg = <0x24 0x6>;
#nvmem-cell-cells = <1>;
};
- macaddr_factory_002a: macaddr at 2a {
+ macaddr_factory_2a: macaddr at 2a {
compatible = "mac-base";
- reg = <0x002a 0x6>;
+ reg = <0x2a 0x6>;
#nvmem-cell-cells = <1>;
};
};
@@ -75,13 +67,13 @@
partition at 380000 {
label = "fip";
- reg = <0x380000 0x01c0000>;
+ reg = <0x380000 0x1c0000>;
read-only;
};
partition at 540000 {
label = "zloader";
- reg = <0x540000 0x0040000>;
+ reg = <0x540000 0x40000>;
read-only;
};
@@ -97,18 +89,3 @@
};
};
};
-
-&gmac0 {
- nvmem-cells = <&macaddr_factory_002a 0>;
- nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
- nvmem-cells = <&macaddr_factory_0024 0>;
- nvmem-cell-names = "mac-address";
-};
-
-&wifi {
- nvmem-cells = <&eeprom_factory>;
- nvmem-cell-names = "eeprom";
-};
More information about the lede-commits
mailing list