[openwrt/openwrt] ramips: create shared dtsi for ZBT WE1326 and WE3526
LEDE Commits
lede-commits at lists.infradead.org
Sun Jul 28 16:23:34 PDT 2024
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/27510dc01b0beb7638dcc17d79cd0f3826eef6bb
commit 27510dc01b0beb7638dcc17d79cd0f3826eef6bb
Author: Shiji Yang <yangshiji66 at qq.com>
AuthorDate: Thu Jul 25 08:53:53 2024 +0800
ramips: create shared dtsi for ZBT WE1326 and WE3526
The hardware of these two models looks the same. This patch also
disabled unused i2c bus for WE3526.
Signed-off-by: Shiji Yang <yangshiji66 at qq.com>
Link: https://github.com/openwrt/openwrt/pull/16009
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts | 168 +-------------------
.../linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts | 171 +--------------------
...t-we1326.dts => mt7621_zbtlink_zbt-wexx26.dtsi} | 125 ++++++++-------
3 files changed, 64 insertions(+), 400 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
index 7dfe9a7699..2b54faae9e 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
@@ -1,7 +1,6 @@
-#include "mt7621.dtsi"
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_zbtlink_zbt-wexx26.dtsi"
/ {
compatible = "zbtlink,zbt-we1326", "mediatek,mt7621-soc";
@@ -10,167 +9,4 @@
aliases {
label-mac-device = &wifi1;
};
-
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "reset";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-};
-
-&state_default {
- gpio {
- groups = "wdt";
- function = "gpio";
- };
-};
-
-&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <10000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
- read-only;
- };
-
- partition at 30000 {
- label = "u-boot-env";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- partition at 40000 {
- label = "factory";
- reg = <0x40000 0x10000>;
- read-only;
-
- nvmem-layout {
- compatible = "fixed-layout";
- #address-cells = <1>;
- #size-cells = <1>;
-
- eeprom_factory_0: eeprom at 0 {
- reg = <0x0 0x400>;
- };
-
- eeprom_factory_8000: eeprom at 8000 {
- reg = <0x8000 0x200>;
- };
-
- macaddr_factory_e000: macaddr at e000 {
- reg = <0xe000 0x6>;
- };
-
- macaddr_factory_e006: macaddr at e006 {
- reg = <0xe006 0x6>;
- };
- };
- };
-
- partition at 50000 {
- compatible = "denx,uimage";
- label = "firmware";
- reg = <0x50000 0xfb0000>;
- };
- };
- };
-};
-
-&gmac0 {
- nvmem-cells = <&macaddr_factory_e000>;
- nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
- status = "okay";
- label = "wan";
- phy-handle = <ðphy4>;
-
- nvmem-cells = <&macaddr_factory_e006>;
- nvmem-cell-names = "mac-address";
-};
-
-ðphy4 {
- /delete-property/ interrupts;
-};
-
-&switch0 {
- ports {
- port at 0 {
- status = "okay";
- label = "lan1";
- };
-
- port at 1 {
- status = "okay";
- label = "lan2";
- };
-
- port at 2 {
- status = "okay";
- label = "lan3";
- };
-
- port at 3 {
- status = "okay";
- label = "lan4";
- };
- };
-};
-
-&pcie {
- status = "okay";
-};
-
-&pcie1 {
- wifi at 0,0 {
- compatible = "mediatek,mt76";
- reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&eeprom_factory_8000>;
- nvmem-cell-names = "eeprom";
- ieee80211-freq-limit = <5000000 6000000>;
-
- led {
- led-sources = <2>;
- led-active-low;
- };
- };
-};
-
-&pcie2 {
- wifi1: wifi at 0,0 {
- compatible = "mediatek,mt76";
- reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&eeprom_factory_0>;
- nvmem-cell-names = "eeprom";
- ieee80211-freq-limit = <2400000 2500000>;
-
- led {
- led-sources = <0>;
- led-active-low;
- };
- };
-};
-
-&sdhci {
- status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
index 3e9282e555..4f40f2926c 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
@@ -1,175 +1,8 @@
-#include "mt7621.dtsi"
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_zbtlink_zbt-wexx26.dtsi"
/ {
compatible = "zbtlink,zbt-we3526", "mediatek,mt7621-soc";
model = "Zbtlink ZBT-WE3526";
-
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "reset";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-};
-
-&i2c {
- status = "okay";
-};
-
-&sdhci {
- status = "okay";
-};
-
-&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <10000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
- read-only;
- };
-
- partition at 30000 {
- label = "u-boot-env";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- partition at 40000 {
- label = "factory";
- reg = <0x40000 0x10000>;
- read-only;
-
- nvmem-layout {
- compatible = "fixed-layout";
- #address-cells = <1>;
- #size-cells = <1>;
-
- eeprom_factory_0: eeprom at 0 {
- reg = <0x0 0x400>;
- };
-
- eeprom_factory_8000: eeprom at 8000 {
- reg = <0x8000 0x200>;
- };
-
- macaddr_factory_e000: macaddr at e000 {
- reg = <0xe000 0x6>;
- };
-
- macaddr_factory_e006: macaddr at e006 {
- reg = <0xe006 0x6>;
- };
- };
- };
-
- partition at 50000 {
- compatible = "denx,uimage";
- label = "firmware";
- reg = <0x50000 0xfb0000>;
- };
- };
- };
-};
-
-&pcie {
- status = "okay";
-};
-
-&pcie1 {
- wifi at 0,0 {
- compatible = "pci14c3,7662";
- reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&eeprom_factory_8000>;
- nvmem-cell-names = "eeprom";
- ieee80211-freq-limit = <5000000 6000000>;
-
- led {
- led-sources = <2>;
- led-active-low;
- };
- };
-};
-
-&pcie2 {
- wifi at 0,0 {
- compatible = "pci14c3,7603";
- reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&eeprom_factory_0>;
- nvmem-cell-names = "eeprom";
-
- led {
- led-sources = <0>;
- led-active-low;
- };
- };
-};
-
-&gmac0 {
- nvmem-cells = <&macaddr_factory_e000>;
- nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
- status = "okay";
- label = "wan";
- phy-handle = <ðphy4>;
-
- nvmem-cells = <&macaddr_factory_e006>;
- nvmem-cell-names = "mac-address";
-};
-
-ðphy4 {
- /delete-property/ interrupts;
-};
-
-&switch0 {
- ports {
- port at 0 {
- status = "okay";
- label = "lan1";
- };
-
- port at 1 {
- status = "okay";
- label = "lan2";
- };
-
- port at 2 {
- status = "okay";
- label = "lan3";
- };
-
- port at 3 {
- status = "okay";
- label = "lan4";
- };
- };
-};
-
-&state_default {
- gpio {
- groups = "wdt";
- function = "gpio";
- };
};
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wexx26.dtsi
similarity index 94%
copy from target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
copy to target/linux/ramips/dts/mt7621_zbtlink_zbt-wexx26.dtsi
index 7dfe9a7699..e1428b7148 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wexx26.dtsi
@@ -1,16 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
#include "mt7621.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
- compatible = "zbtlink,zbt-we1326", "mediatek,mt7621-soc";
- model = "Zbtlink ZBT-WE1326";
-
- aliases {
- label-mac-device = &wifi1;
- };
-
chosen {
bootargs = "console=ttyS0,115200";
};
@@ -26,13 +21,62 @@
};
};
-&state_default {
- gpio {
- groups = "wdt";
- function = "gpio";
+ðphy4 {
+ /delete-property/ interrupts;
+};
+
+&gmac0 {
+ nvmem-cells = <&macaddr_factory_e000>;
+ nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+ status = "okay";
+ label = "wan";
+ phy-handle = <ðphy4>;
+
+ nvmem-cells = <&macaddr_factory_e006>;
+ nvmem-cell-names = "mac-address";
+};
+
+&pcie {
+ status = "okay";
+};
+
+&pcie1 {
+ wifi at 0,0 {
+ compatible = "mediatek,mt76";
+ reg = <0x0000 0 0 0 0>;
+ nvmem-cells = <&eeprom_factory_8000>;
+ nvmem-cell-names = "eeprom";
+ ieee80211-freq-limit = <5000000 6000000>;
+
+ led {
+ led-sources = <2>;
+ led-active-low;
+ };
+ };
+};
+
+&pcie2 {
+ wifi1: wifi at 0,0 {
+ compatible = "mediatek,mt76";
+ reg = <0x0000 0 0 0 0>;
+ nvmem-cells = <&eeprom_factory_0>;
+ nvmem-cell-names = "eeprom";
+ ieee80211-freq-limit = <2400000 2500000>;
+
+ led {
+ led-sources = <0>;
+ led-active-low;
+ };
};
};
+&sdhci {
+ status = "okay";
+};
+
&spi0 {
status = "okay";
@@ -95,22 +139,11 @@
};
};
-&gmac0 {
- nvmem-cells = <&macaddr_factory_e000>;
- nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
- status = "okay";
- label = "wan";
- phy-handle = <ðphy4>;
-
- nvmem-cells = <&macaddr_factory_e006>;
- nvmem-cell-names = "mac-address";
-};
-
-ðphy4 {
- /delete-property/ interrupts;
+&state_default {
+ gpio {
+ groups = "wdt";
+ function = "gpio";
+ };
};
&switch0 {
@@ -136,41 +169,3 @@
};
};
};
-
-&pcie {
- status = "okay";
-};
-
-&pcie1 {
- wifi at 0,0 {
- compatible = "mediatek,mt76";
- reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&eeprom_factory_8000>;
- nvmem-cell-names = "eeprom";
- ieee80211-freq-limit = <5000000 6000000>;
-
- led {
- led-sources = <2>;
- led-active-low;
- };
- };
-};
-
-&pcie2 {
- wifi1: wifi at 0,0 {
- compatible = "mediatek,mt76";
- reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&eeprom_factory_0>;
- nvmem-cell-names = "eeprom";
- ieee80211-freq-limit = <2400000 2500000>;
-
- led {
- led-sources = <0>;
- led-active-low;
- };
- };
-};
-
-&sdhci {
- status = "okay";
-};
More information about the lede-commits
mailing list