ipq40xx: remove ethernet0 alias

Not needed when using nvmem. All others left alone.

Move some swport nvmem definitions to the root gmac to avoid a
randomized MAC address for the GMAC. The former inherits from the latter anyway.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22550
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts b/target/linux/ipq40xx/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts
index 6580e0161eedfdb057615dae63c5b3b779e401ae..ddf33b75cef0574d71c90463720e8d6c703dfa4f 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts
@@ -11,8 +11,6 @@
        compatible = "ezviz,cs-w3-wd1200g-eup";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_status_green;
                led-failsafe = &led_status_red;
                led-running = &led_status_blue;
@@ -249,6 +247,7 @@
 
 &gmac {
        status = "okay";
+
        nvmem-cells = <&macaddr_art_0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/dts/qcom-ipq4018-eap1300.dts
index 4acf44dc1601fb7a8e527588a0c9604344672520..c5a26810e7e282b7799ea5b0d7cd2717d64c2b31 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4018-eap1300.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4018-eap1300.dts
@@ -41,12 +41,11 @@
        };
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &power;
                led-failsafe = &power;
                led-running = &power;
                led-upgrade = &power;
+               label-mac-device = &gmac;
        };
 
        leds {
@@ -238,12 +237,13 @@
 &swport5 {
        status = "okay";
        label = "lan";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
 };
 
 &gmac {
        status = "okay";
+
+       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
 };
 
 &mdio {

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4018-gl-ap1300.dts b/target/linux/ipq40xx/dts/qcom-ipq4018-gl-ap1300.dts
index c6ab89286784a7970c3d326a2743bf25a8a15c3c..5e722ad623cc31aa46856c504b713d6d25dea4d6 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4018-gl-ap1300.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4018-gl-ap1300.dts
@@ -11,12 +11,11 @@
        compatible = "glinet,gl-ap1300";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;
                led-upgrade = &led_power;
+               label-mac-device = &gmac;
        };
 
        memory {
@@ -273,6 +272,9 @@
 
 &gmac {
        status = "okay";
+
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &switch {
@@ -282,9 +284,6 @@
 &swport4 {
        status = "okay";
        label = "lan";
-
-       nvmem-cells = <&macaddr_art_0>;
-       nvmem-cell-names = "mac-address";
 };
 
 &swport5 {

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4018-mf287_common.dtsi b/target/linux/ipq40xx/dts/qcom-ipq4018-mf287_common.dtsi
index 9c23ad3c0a58625d45c797edd7e272a8be45c9eb..ed8cdfdea26d5cc44e41414db382bea57732a6ca 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4018-mf287_common.dtsi
+++ b/target/linux/ipq40xx/dts/qcom-ipq4018-mf287_common.dtsi
@@ -11,8 +11,6 @@
 
 / {
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_status;
                led-failsafe = &led_status;
                led-running = &led_status;

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-cm520-79f.dts
index 3346fc8098f6d6e34915a8128a00ae648d6e5504..3569d6e53ab7124e38e9001befed41013af2d08c 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-cm520-79f.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-cm520-79f.dts
@@ -11,8 +11,6 @@
        compatible = "mobipromo,cm520-79f";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_sys;
                led-failsafe = &led_sys;
                led-running = &led_sys;

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c1.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c1.dts
index 00fc918ccfc2d8f46cf5b9cb20fe2a6bfa8f985a..d0c71acd7dba13ccd95b04473a6c5bee652f365a 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c1.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c1.dts
@@ -11,11 +11,6 @@
 / {
        model = "Qxwlan E2600AC c1";
        compatible = "qxwlan,e2600ac-c1";
-
-       aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
-       };
 };
 
 &blsp1_spi1 {
@@ -121,6 +116,9 @@
 
 &gmac {
        status = "okay";
+
+       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_gmac0>;
 };
 
 &switch {
@@ -130,9 +128,6 @@
 &swport4 {
        status = "okay";
        label = "sw-eth1";
-
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
 };
 
 &swport5 {

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c2.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c2.dts
index c2c602114f898384772c23b360007e3026ab5288..67f59ff6971d22a05a6f91ad2ab7c3d08e5c962e 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c2.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-e2600ac-c2.dts
@@ -11,11 +11,6 @@
 / {
        model = "Qxwlan E2600AC c2";
        compatible = "qxwlan,e2600ac-c2";
-
-       aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
-       };
 };
 
 &blsp1_spi1 {
@@ -160,6 +155,9 @@
 
 &gmac {
        status = "okay";
+
+       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_gmac0>;
 };
 
 &switch {
@@ -169,9 +167,6 @@
 &swport2 {
        status = "okay";
        label = "sw-eth1";
-
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
 };
 
 &swport4 {

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-habanero-dvk.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-habanero-dvk.dts
index 3f91955d1d27652f6cb2817fd93e7b593703546d..3a421cb8c500bcc4383fc58bdd097dc514e2059a 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-habanero-dvk.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-habanero-dvk.dts
@@ -12,8 +12,6 @@
        compatible = "8dev,habanero-dvk";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_status;
                led-failsafe = &led_status;
                led-running = &led_status;

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-mf18a.dts
index c2a3acd7f0fd8dfc3ddd0d4088e8b6b6b8955912..bc239d592f3bd9c29dc0da857c2b638a31bc3db8 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-mf18a.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-mf18a.dts
@@ -14,8 +14,6 @@
        compatible = "zte,mf18a";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;
@@ -231,6 +229,7 @@
 
 &gmac {
        status = "okay";
+
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_config_0 0>;
 };

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-mf282plus.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-mf282plus.dts
index 02114436e057dce86f2fcd1589345ce350e2b446..0977e7bc5d04ebbeee1cb7f1e08785ba6ba90889 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-mf282plus.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-mf282plus.dts
@@ -13,8 +13,6 @@
        compatible = "zte,mf282plus";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_internal;
                led-failsafe = &led_internal;
                led-running = &led_internal;
@@ -213,6 +211,7 @@
 
 &gmac {
        status = "okay";
+
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_config_0 0>;
 };

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-mf286d.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-mf286d.dts
index 3ccc0a99c2eba03879a54ee7d656cee73a4806ae..eef1b8d4f9df095a14f9c5723c5ae247db4c6731 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-mf286d.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-mf286d.dts
@@ -12,8 +12,6 @@
        compatible = "zte,mf286d";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_internal;
                led-failsafe = &led_internal;
                led-running = &led_internal;
@@ -207,6 +205,7 @@
 
 &gmac {
        status = "okay";
+
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_config_0 0>;
 };

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-mf289f.dts
index d677ab624618cbbc9cc0b5d9367afd95dda396a5..b151dde4e2bd2b119532f6266f40bb522bd06c49 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-mf289f.dts
@@ -13,8 +13,6 @@
        compatible = "zte,mf289f";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_status;
                led-failsafe = &led_status;
                led-running = &led_status;
@@ -316,6 +314,7 @@
 
 &gmac {
        status = "okay";
+
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_mac_0 0>;
 };

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4019-wtr-m2133hp.dts b/target/linux/ipq40xx/dts/qcom-ipq4019-wtr-m2133hp.dts
index 819220725bc721cc1015873ef12a824a83cfe724..41940bce021460ccbda177a7d0916d7b2f28710f 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4019-wtr-m2133hp.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4019-wtr-m2133hp.dts
@@ -29,8 +29,6 @@
        };
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_power_blue;
                led-failsafe = &led_power_orange;
                led-running = &led_power_white;
@@ -445,6 +443,7 @@
 
 &gmac {
        status = "okay";
+
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_orgdata_20>;
 };

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/dts/qcom-ipq4028-wpj428.dts
index 0e4e97c26ea0a67e7fe82520c2923dd90ef4c76d..a1e2ab38814e08f1ee3fc980b11da1d4b96deb66 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4028-wpj428.dts
@@ -73,8 +73,6 @@
        };
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &status;
                led-failsafe = &status;
                led-upgrade = &status;
@@ -263,6 +261,9 @@
 
 &gmac {
        status = "okay";
+
+       nvmem-cells = <&macaddr_art_e018>;
+       nvmem-cell-names = "mac-address";
 };
 
 &switch {
@@ -272,9 +273,6 @@
 &swport4 {
        status = "okay";
        label = "lan1";
-
-       nvmem-cells = <&macaddr_art_e018>;
-       nvmem-cell-names = "mac-address";
 };
 
 &swport5 {

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/dts/qcom-ipq4029-ap-303h.dts
index 737961e8ef0efa396d0a7a744ebe6fb7f4a484c9..2025500e8527f71abf38fb81c11f882e64f2a7b0 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-ap-303h.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-ap-303h.dts
@@ -10,8 +10,6 @@
        compatible = "aruba,ap-303h";
 
        aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
                led-boot = &led_system_green;
                led-failsafe = &led_system_red;
                led-running = &led_system_green;

diff --git a/target/linux/ipq40xx/dts/qcom-ipq40x9-dr40x9.dts b/target/linux/ipq40xx/dts/qcom-ipq40x9-dr40x9.dts
index c6e8648b548110d011fa974d6526e75c53e50e26..a81955d0bdcc08e141b30f2fc78b7c31c91bf065 100644 (file)
--- a/target/linux/ipq40xx/dts/qcom-ipq40x9-dr40x9.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq40x9-dr40x9.dts
@@ -9,11 +9,6 @@
        model = "Wallystech DR40X9";
        compatible = "wallys,dr40x9";
 
-       aliases {
-               // TODO: Verify if the ethernet0 alias is needed
-               ethernet0 = &gmac;
-       };
-
        chosen {
                bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1";
        };
@@ -349,6 +344,9 @@
 
 &gmac {
        status = "okay";
+
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &switch {
@@ -358,8 +356,6 @@
 &swport4 {
        status = "okay";
        label = "wan";
-       nvmem-cells = <&macaddr_art_0>;
-       nvmem-cell-names = "mac-address";
 };
 
 &swport5 {