mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
95d3d353f8
Copy patches from patches-6.1 to patches-6.6. No changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
61 lines
1.1 KiB
Diff
61 lines
1.1 KiB
Diff
--- a/arch/arm/boot/dts/mt7629-rfb.dts
|
|
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
|
|
@@ -18,6 +18,7 @@
|
|
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
+ bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8";
|
|
};
|
|
|
|
gpio-keys {
|
|
@@ -70,6 +71,10 @@
|
|
compatible = "mediatek,eth-mac";
|
|
reg = <0>;
|
|
phy-mode = "2500base-x";
|
|
+
|
|
+ nvmem-cells = <&macaddr_factory_2a>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+
|
|
fixed-link {
|
|
speed = <2500>;
|
|
full-duplex;
|
|
@@ -82,6 +87,9 @@
|
|
reg = <1>;
|
|
phy-mode = "gmii";
|
|
phy-handle = <&phy0>;
|
|
+
|
|
+ nvmem-cells = <&macaddr_factory_24>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
mdio: mdio-bus {
|
|
@@ -133,8 +141,9 @@
|
|
};
|
|
|
|
partition@b0000 {
|
|
- label = "kernel";
|
|
+ label = "firmware";
|
|
reg = <0xb0000 0xb50000>;
|
|
+ compatible = "denx,fit";
|
|
};
|
|
};
|
|
};
|
|
@@ -273,3 +282,17 @@
|
|
pinctrl-0 = <&watchdog_pins>;
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&factory {
|
|
+ compatible = "nvmem-cells";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ macaddr_factory_24: macaddr@24 {
|
|
+ reg = <0x24 0x6>;
|
|
+ };
|
|
+
|
|
+ macaddr_factory_2a: macaddr@2a {
|
|
+ reg = <0x2a 0x6>;
|
|
+ };
|
|
+};
|