projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: rtxxxx: remove mac-address-increment
[openwrt/openwrt.git]
/
target
/
linux
/
ramips
/
dts
/
mt7621_zbtlink_zbt-wg2626.dts
diff --git
a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
index 6461302154f900736e371216c35ac7b66e51f29e..c1d5b03964f2d02cf153e5cc047f3e9a850a68fb 100644
(file)
--- a/
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
+++ b/
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
@@
-1,5
+1,3
@@
-/dts-v1/;
-
#include "mt7621.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include "mt7621.dtsi"
#include <dt-bindings/gpio/gpio.h>
@@
-20,12
+18,6
@@
bootargs = "console=ttyS0,115200";
};
bootargs = "console=ttyS0,115200";
};
- palmbus: palmbus@1E000000 {
- i2c@900 {
- status = "okay";
- };
- };
-
keys {
compatible = "gpio-keys";
keys {
compatible = "gpio-keys";
@@
-40,12
+32,16
@@
compatible = "gpio-leds";
led_status: status {
compatible = "gpio-leds";
led_status: status {
- label = "
zbt-wg2626:
green:status";
+ label = "green:status";
gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
};
};
};
gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
};
};
};
+&i2c {
+ status = "okay";
+};
+
&sdhci {
status = "okay";
};
&sdhci {
status = "okay";
};
@@
-53,7
+49,7
@@
&spi0 {
status = "okay";
&spi0 {
status = "okay";
-
m25p80
@0 {
+
flash
@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
@@
-76,9
+72,24
@@
};
factory: partition@40000 {
};
factory: partition@40000 {
+ compatible = "nvmem-cells";
label = "factory";
reg = <0x40000 0x10000>;
label = "factory";
reg = <0x40000 0x10000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
read-only;
read-only;
+
+ eeprom_factory_0: eeprom@0 {
+ reg = <0x0 0x200>;
+ };
+
+ eeprom_factory_8000: eeprom@8000 {
+ reg = <0x8000 0x200>;
+ };
+
+ macaddr_factory_e000: macaddr@e000 {
+ reg = <0xe000 0x6>;
+ };
};
partition@50000 {
};
partition@50000 {
@@
-92,12
+103,16
@@
&pcie {
status = "okay";
&pcie {
status = "okay";
+
+ reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
+ <&gpio 8 GPIO_ACTIVE_LOW>;
};
&pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
};
&pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x8000>;
+ nvmem-cells = <&eeprom_factory_8000>;
+ nvmem-cell-names = "eeprom";
ieee80211-freq-limit = <5000000 6000000>;
};
};
ieee80211-freq-limit = <5000000 6000000>;
};
};
@@
-105,49
+120,56
@@
&pcie1 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
&pcie1 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x0000>;
+ nvmem-cells = <&eeprom_factory_0>;
+ nvmem-cell-names = "eeprom";
ieee80211-freq-limit = <2400000 2500000>;
};
};
ieee80211-freq-limit = <2400000 2500000>;
};
};
+ðernet {
+ pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
&gmac0 {
&gmac0 {
- mtd-mac-address = <&factory 0xe000>;
+ nvmem-cells = <&macaddr_factory_e000>;
+ nvmem-cell-names = "mac-address";
};
&switch0 {
ports {
port@0 {
status = "okay";
};
&switch0 {
ports {
port@0 {
status = "okay";
- label = "lan
1
";
+ label = "lan
4
";
};
port@1 {
status = "okay";
};
port@1 {
status = "okay";
- label = "lan
2
";
+ label = "lan
3
";
};
port@2 {
status = "okay";
};
port@2 {
status = "okay";
- label = "lan
3
";
+ label = "lan
2
";
};
port@3 {
status = "okay";
};
port@3 {
status = "okay";
- label = "lan
4
";
+ label = "lan
1
";
};
port@4 {
status = "okay";
label = "wan";
};
port@4 {
status = "okay";
label = "wan";
- mtd-mac-address = <&factory 0xe000>;
- mtd-mac-address-increment = <1>;
+ nvmem-cells = <&macaddr_factory_e000>;
+ nvmem-cell-names = "mac-address";
+ mac-address-increment = <1>;
};
};
};
&state_default {
gpio {
};
};
};
&state_default {
gpio {
- groups = "wdt", "rgmii2"
, "jtag", "mdio"
;
+ groups = "wdt", "rgmii2";
function = "gpio";
};
};
function = "gpio";
};
};