realtek: dts: convert LGS3xxC to NVMEM

These devices contain a single MAC address in the U-Boot environment.
Set it as eth0 and label MAC in device tree. To maintain the current
state, the 02_network script still sets individual port MAC addresses
and the bridge MAC address.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22302
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
index 7fccc77f582ed944daf7eaf99b8308c84e7248bf..21c949380ff99445f7997ff489a83b1010df0d0d 100644 (file)
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -53,6 +53,9 @@ realtek_setup_macs()
 
        case $board in
        edgecore,ecs4100-12ph|\
+       linksys,lgs310c|\
+       linksys,lgs328c|\
+       linksys,lgs352c|\
        netgear,gs108t-v3|\
        netgear,gs110tpp-v1|\
        netgear,gs110tup-v1|\
@@ -117,9 +120,6 @@ realtek_setup_macs()
        hasivo,s1100w-8xgt-se|\
        inaba,aml2-17gp|\
        iodata,bsh-g24mb|\
-       linksys,lgs310c|\
-       linksys,lgs328c|\
-       linksys,lgs352c|\
        netgear,gs750e|\
        panasonic,m16eg-pn28160k|\
        panasonic,m24eg-pn28240k|\

diff --git a/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts b/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
index f0980b9af463cfce333d684ffbe887def6a43213..4ce6e97b9595cb39b42a684f48037a3eb106e801 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
+++ b/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
@@ -11,6 +11,7 @@
        model = "Linksys LGS310C";
 
        aliases {
+               label-mac-device = &ethernet0;
                led-boot = &led_power;
                led-failsafe = &led_fault;
                led-running = &led_power;
@@ -84,6 +85,12 @@
        };
 };
 
+
+&ethernet0 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
+       nvmem-cell-names = "mac-address";
+};
+
 &mdio_aux {
        status = "okay";
 
@@ -122,6 +129,14 @@
                        partition@80000 {
                                label = "u-boot-env";
                                reg = <0x00080000 0x10000>;
+
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_ubootenv_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                        partition@90000 {
                                label = "u-boot-env2";

diff --git a/target/linux/realtek/dts/rtl93xx_linksys_lgs3xxc_nand_common.dtsi b/target/linux/realtek/dts/rtl93xx_linksys_lgs3xxc_nand_common.dtsi
index 8fd5615c9923de1c43d5132e986df1e7c4ba9623..e452d870610ff472169060a51a68060e96fe3fd5 100644 (file)
--- a/target/linux/realtek/dts/rtl93xx_linksys_lgs3xxc_nand_common.dtsi
+++ b/target/linux/realtek/dts/rtl93xx_linksys_lgs3xxc_nand_common.dtsi
@@ -6,6 +6,7 @@
 
 / {
        aliases {
+               label-mac-device = &ethernet0;
                led-boot = &led_power;
                led-failsafe = &led_fault;
                led-running = &led_power;
@@ -89,6 +90,11 @@
        status = "okay";
 };
 
+&ethernet0 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
+       nvmem-cell-names = "mac-address";
+};
+
 &spi0 {
        status = "okay";
        flash@0 {
@@ -109,6 +115,14 @@
                        partition@e0000 {
                                label = "u-boot-env";
                                reg = <0xe0000 0x10000>;
+
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_ubootenv_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                        partition@f0000 {
                                label = "u-boot-env2";