From 7140394903b1bfbbb589dafa524e2dbd6cd79862 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 24 Jun 2019 17:57:15 +0200 Subject: ramips: provide label MAC address This patch adds the label MAC address for several devices in ramips. Some devices require setting the MAC address in 02_network: For the following devices, the netif device can be linked in device tree, but the MAC address cannot be read: - cudy,wr1000 - dlink,dir-615-d - dlink,dir-615-h1 - dlink,dir-860l-b1 - glinet,gl-mt300a - glinet,gl-mt300n - glinet,gl-mt750 - vocore,vocore2 - vocore,vocore2-lite - zbtlink,zbt-we1326 - zbtlink,zbt-wg3526 For the following devices, label MAC address is tied to lan or wan, so no node to link to exists in device tree: - dlink,dir-510l - dlink,dwr-116-a1 - dlink,dwr-118-a1 - dlink,dwr-118-a2 - dlink,dwr-921-c1 - dlink,dwr-922-e2 - all hiwifi devices - lava,lr-25g001 - xiaomi,mir3p Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts | 1 + target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts | 4 ++++ target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts | 4 ++++ target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts | 4 ++++ target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts | 1 + target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts | 1 + target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts | 1 + target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi | 1 + target/linux/ramips/dts/mt7621_adslr_g7.dts | 1 + target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts | 1 + target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts | 5 +++-- target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts | 1 + target/linux/ramips/dts/mt7621_mtc_wr1201.dts | 1 + target/linux/ramips/dts/mt7621_netgear_r6220.dtsi | 1 + target/linux/ramips/dts/mt7621_netgear_r6260_r6350_r6850.dtsi | 1 + target/linux/ramips/dts/mt7621_tplink_re650-v1.dts | 1 + target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi | 4 ++++ target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts | 8 ++++++-- target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi | 5 +++-- target/linux/ramips/dts/mt7628an_cudy_wr1000.dts | 1 + target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts | 1 + target/linux/ramips/dts/mt7628an_iptime_a604m.dts | 1 + target/linux/ramips/dts/mt7628an_netgear_r6120.dts | 1 + target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 4 ++++ target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 4 ++++ target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi | 4 ++++ target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts | 1 + target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts | 1 + target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts | 1 + target/linux/ramips/dts/rt5350_vocore_vocore.dtsi | 1 + target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts | 1 + 31 files changed, 61 insertions(+), 6 deletions(-) (limited to 'target/linux/ramips/dts') diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index f440c03536..687d80fa5d 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power_green; led-running = &led_power_green; led-upgrade = &led_power_green; + label-mac-device = ðernet; }; keys { diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts index 2cea9d9beb..ba446a4c8d 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts @@ -9,6 +9,10 @@ compatible = "glinet,gl-mt300a", "ralink,mt7620a-soc"; model = "GL-MT300A"; + aliases { + label-mac-device = &wmac; + }; + chosen { bootargs = "console=ttyS0,115200"; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts index a30792cace..444ffb0440 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts @@ -9,6 +9,10 @@ compatible = "glinet,gl-mt300n", "ralink,mt7620a-soc"; model = "GL-MT300N"; + aliases { + label-mac-device = &wmac; + }; + chosen { bootargs = "console=ttyS0,115200"; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index 11133a126a..8fc0df2a33 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts @@ -9,6 +9,10 @@ compatible = "glinet,gl-mt750", "ralink,mt7620a-soc"; model = "GL-MT750"; + aliases { + label-mac-device = &wmac; + }; + chosen { bootargs = "console=ttyS0,115200"; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts index b8c0ec8a83..2b98d6c55f 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts @@ -11,6 +11,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; leds { diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts index bf51329114..de01b480e5 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts @@ -11,6 +11,7 @@ led-failsafe = &led_power_blue; led-running = &led_power_blue; led-upgrade = &led_power_blue; + label-mac-device = ðernet; }; gpio_export { diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts index e8ff02f2ab..15493e9783 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts +++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts @@ -14,6 +14,7 @@ led-failsafe = &led_blue; led-running = &led_blue; led-upgrade = &led_blue; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi index 59558a2e96..701701c1de 100644 --- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi +++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi @@ -11,6 +11,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; keys { diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts index 9c92d77102..c086b16f7d 100644 --- a/target/linux/ramips/dts/mt7621_adslr_g7.dts +++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts @@ -15,6 +15,7 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts index d51eb29600..39c16a569f 100644 --- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts +++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power_blue; led-running = &led_power_blue; led-upgrade = &led_power_blue; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts index 5ddb6302cb..13b1dc0519 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power_green; led-running = &led_power_green; led-upgrade = &led_power_green; + label-mac-device = &wifi1; }; chosen { @@ -119,7 +120,7 @@ }; &pcie0 { - mt76@0,0 { + wifi0: mt76@0,0 { reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&radio 0x2000>; ieee80211-freq-limit = <5000000 6000000>; @@ -127,7 +128,7 @@ }; &pcie1 { - mt76@0,0 { + wifi1: mt76@0,0 { reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&radio 0>; ieee80211-freq-limit = <2400000 2500000>; diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts index e681e1a0c9..1ab3390093 100644 --- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts +++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts @@ -14,6 +14,7 @@ led-failsafe = &led_blue; led-running = &led_blue; led-upgrade = &led_blue; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts index 6f46818800..885f6dcc8d 100644 --- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts +++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_netgear_r6220.dtsi b/target/linux/ramips/dts/mt7621_netgear_r6220.dtsi index a25a677d3b..44dec9ef85 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6220.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_r6220.dtsi @@ -14,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_netgear_r6260_r6350_r6850.dtsi b/target/linux/ramips/dts/mt7621_netgear_r6260_r6350_r6850.dtsi index 2fe4d241cc..c09fb947c1 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6260_r6350_r6850.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_r6260_r6350_r6850.dtsi @@ -14,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts index 5c1d308ed8..23b559daa8 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts @@ -15,6 +15,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi index 2aaca83261..b8de4113e2 100644 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi +++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi @@ -6,6 +6,10 @@ / { compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc"; + aliases { + label-mac-device = ðernet; + }; + chosen { bootargs = "console=ttyS0,57600"; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts index 2f6f94f3ff..819c851c73 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts @@ -9,6 +9,10 @@ compatible = "zbtlink,zbt-we1326", "mediatek,mt7621-soc"; model = "ZBT-WE1326"; + aliases { + label-mac-device = &wifi1; + }; + chosen { bootargs = "console=ttyS0,115200"; }; @@ -83,7 +87,7 @@ }; &pcie0 { - mt76@0,0 { + wifi0: mt76@0,0 { reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x8000>; ieee80211-freq-limit = <5000000 6000000>; @@ -91,7 +95,7 @@ }; &pcie1 { - mt76@0,0 { + wifi1: mt76@0,0 { reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x0000>; ieee80211-freq-limit = <2400000 2500000>; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi index 87999b1e46..a2ab252b7e 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi @@ -11,6 +11,7 @@ led-failsafe = &led_status; led-running = &led_status; led-upgrade = &led_status; + label-mac-device = &wifi0; }; chosen { @@ -92,7 +93,7 @@ }; &pcie0 { - wifi@0,0 { + wifi0: wifi@0,0 { compatible = "pci14c3,7603"; reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x0000>; @@ -100,7 +101,7 @@ }; &pcie1 { - wifi@0,0 { + wifi1: wifi@0,0 { compatible = "pci14c3,7662"; reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x8000>; diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index ad81e8303d..074a5ab1ae 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -14,6 +14,7 @@ led-boot = &led_wps; led-failsafe = &led_wps; led-upgrade = &led_wps; + label-mac-device = &wmac; }; keys { diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index 6222cfe345..785088b633 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts index d21f4f6974..8ccc649a82 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts @@ -15,6 +15,7 @@ led-failsafe = &led_cpu; led-running = &led_cpu; led-upgrade = &led_cpu; + label-mac-device = ðernet; }; leds { diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index e6d8ea478b..9f1ea1d68a 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; keys { diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi index 04c6062e16..6d7fb01c56 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi @@ -5,6 +5,10 @@ chosen { bootargs = "console=ttyS0,115200"; }; + + aliases { + label-mac-device = ðernet; + }; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi index 9e3db9971a..ba3350ed02 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi @@ -4,6 +4,10 @@ chosen { bootargs = "console=ttyS0,115200"; }; + + aliases { + label-mac-device = ðernet; + }; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi index f7aec8e1f5..0f7e63dfe3 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi @@ -3,6 +3,10 @@ / { compatible = "vocore,vocore2", "mediatek,mt7628an-soc"; + aliases { + label-mac-device = &wmac; + }; + chosen { bootargs = "console=ttyS2,115200"; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts index 69cc5e252a..16018ff1f0 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts @@ -14,6 +14,7 @@ led-failsafe = &led_status_green; led-running = &led_status_green; led-upgrade = &led_status_green; + label-mac-device = &wmac; }; cfi@1f000000 { diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts index 79d4717f57..a87fc1e9a2 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts @@ -14,6 +14,7 @@ led-failsafe = &led_status_green; led-running = &led_status_green; led-upgrade = &led_status_green; + label-mac-device = &wmac; }; leds { diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index 707963d691..f4e4d17b02 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -14,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; leds { diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi index c5c26e77c8..cce444c007 100644 --- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi +++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi @@ -10,6 +10,7 @@ led-failsafe = &led_status; led-running = &led_status; led-upgrade = &led_status; + label-mac-device = ðernet; }; gpio-export { diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index 16ab9567c0..6f1f6097cc 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts @@ -15,6 +15,7 @@ led-failsafe = &led_status; led-running = &led_status; led-upgrade = &led_status; + label-mac-device = ðernet; }; leds { -- cgit v1.2.3