From e222c8054c7f46192bc89ad1f3ab61b3861af8b9 Mon Sep 17 00:00:00 2001 From: Alan Luck Date: Thu, 15 Feb 2024 16:31:12 +1100 Subject: [PATCH] ramips: fix and clean up D-Link MAC address add back WIFI eprom addresses pointer in mt7621_dlink_dir-xx60-a1.dtsi Change MAC address pointer from factory_e006 to factory_e000 + 3 same as used in D-link firmware 1.11 DIR-1960-A1 DIR-1960-A1,DIR-2640-A1,DIR-2660-A1,DIR-3060-A1 Clean-up MAC addresses in D-Link NOR devices DTS's Change WIFI MAC Addressees to the same as NAND cousins macaddr_factory_e000 + ? as later devices don't have the MAC address in factory configuration same as used in D-Link firmware 1.30 DIR-878-A1 DIR-867-A1,DIR-878-A1,DIR-878-R1,DIR-882-A1,DIR-882-R1,DIR-1935-A1 * D-link software differs between source of wan address Signed-off-by: Alan Luck --- .../ramips/dts/mt7621_dlink_dir-1935-a1.dts | 14 -------------- .../ramips/dts/mt7621_dlink_dir-867-a1.dts | 14 -------------- .../ramips/dts/mt7621_dlink_dir-878-a1.dts | 14 -------------- .../ramips/dts/mt7621_dlink_dir-878-r1.dts | 14 -------------- .../ramips/dts/mt7621_dlink_dir-882-a1.dts | 14 -------------- .../ramips/dts/mt7621_dlink_dir-882-r1.dts | 14 -------------- .../linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi | 17 +++++++++++++---- .../ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi | 14 +++++--------- .../ramips/dts/mt7621_dlink_flash-16m-a1.dtsi | 2 ++ .../ramips/dts/mt7621_dlink_flash-16m-r1.dtsi | 2 ++ 10 files changed, 22 insertions(+), 97 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-1935-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-1935-a1.dts index 0ce07141a3..60b5b35621 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-1935-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-1935-a1.dts @@ -6,18 +6,4 @@ / { compatible = "dlink,dir-1935-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-1935 A1"; - - aliases { - label-mac-device = &gmac0; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - nvmem-cells = <&macaddr_factory_e006>; - nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts index ab5a110333..e02eb9eebf 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts @@ -6,18 +6,4 @@ / { compatible = "dlink,dir-867-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-867 A1"; - - aliases { - label-mac-device = &gmac0; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - nvmem-cells = <&macaddr_factory_e006>; - nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts index f9ed0ddcef..1f1d5824f2 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts @@ -6,18 +6,4 @@ / { compatible = "dlink,dir-878-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-878 A1"; - - aliases { - label-mac-device = &gmac0; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - nvmem-cells = <&macaddr_factory_e006>; - nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-r1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-878-r1.dts index 1a17dddc11..0bacd6569f 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-878-r1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-878-r1.dts @@ -6,18 +6,4 @@ / { compatible = "dlink,dir-878-r1", "mediatek,mt7621-soc"; model = "D-Link DIR-878 R1"; - - aliases { - label-mac-device = &gmac0; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - nvmem-cells = <&macaddr_factory_e006>; - nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts index 2f45eda02d..01739fc258 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts @@ -6,10 +6,6 @@ / { compatible = "dlink,dir-882-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-882 A1"; - - aliases { - label-mac-device = &gmac0; - }; }; &leds { @@ -27,13 +23,3 @@ linux,default-trigger = "usbport"; }; }; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - nvmem-cells = <&macaddr_factory_e006>; - nvmem-cell-names = "mac-address"; -}; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts index 019ad7edcf..9b0cd8e7be 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts @@ -6,10 +6,6 @@ / { compatible = "dlink,dir-882-r1", "mediatek,mt7621-soc"; model = "D-Link DIR-882 R1"; - - aliases { - label-mac-device = &gmac0; - }; }; &leds { @@ -27,13 +23,3 @@ linux,default-trigger = "usbport"; }; }; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - nvmem-cells = <&macaddr_factory_e006>; - nvmem-cell-names = "mac-address"; -}; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi index b94a0784fe..11d673dc87 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi +++ b/target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi @@ -8,6 +8,7 @@ / { aliases { + label-mac-device = &gmac0; led-boot = &led_power_orange; led-failsafe = &led_power_green; led-running = &led_power_green; @@ -71,8 +72,8 @@ wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; - nvmem-cells = <&eeprom_factory_0>; - nvmem-cell-names = "eeprom"; + nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000 1>; + nvmem-cell-names = "eeprom", "mac-address"; ieee80211-freq-limit = <2400000 2500000>; led { @@ -85,8 +86,8 @@ wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; - nvmem-cells = <&eeprom_factory_8000>; - nvmem-cell-names = "eeprom"; + nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000 2>; + nvmem-cell-names = "eeprom", "mac-address"; ieee80211-freq-limit = <5000000 6000000>; led { @@ -95,10 +96,18 @@ }; }; +&gmac0 { + nvmem-cells = <&macaddr_factory_e000 0>; + nvmem-cell-names = "mac-address"; +}; + &gmac1 { status = "okay"; label = "wan"; phy-handle = <ðphy4>; + + nvmem-cells = <&macaddr_factory_e006 0>; + nvmem-cell-names = "mac-address"; }; &mdio { diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi index ddc3e1ad30..7b7228b8c3 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi +++ b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi @@ -101,10 +101,6 @@ reg = <0xe000 0x6>; #nvmem-cell-cells = <1>; }; - - macaddr_factory_e006: macaddr@e006 { - reg = <0xe006 0x6>; - }; }; }; @@ -154,8 +150,8 @@ wifi0: wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; - nvmem-cells = <&macaddr_factory_e000 1>; - nvmem-cell-names = "eeprom"; + nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000 1>; + nvmem-cell-names = "eeprom", "mac-address"; ieee80211-freq-limit = <2400000 2500000>; led { @@ -168,8 +164,8 @@ wifi1: wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; - nvmem-cells = <&macaddr_factory_e000 2>; - nvmem-cell-names = "eeprom"; + nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000 2>; + nvmem-cell-names = "eeprom", "mac-address"; ieee80211-freq-limit = <5000000 6000000>; led { @@ -188,7 +184,7 @@ label = "wan"; phy-handle = <ðphy4>; - nvmem-cells = <&macaddr_factory_e006>; + nvmem-cells = <&macaddr_factory_e000 3>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi index ea6b9f23e8..96a6b286fe 100644 --- a/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi +++ b/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi @@ -44,7 +44,9 @@ }; macaddr_factory_e000: macaddr@e000 { + compatible = "mac-base"; reg = <0xe000 0x6>; + #nvmem-cell-cells = <1>; }; macaddr_factory_e006: macaddr@e006 { diff --git a/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi b/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi index dd13e7aeeb..6d77044aa4 100644 --- a/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi +++ b/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi @@ -50,7 +50,9 @@ }; macaddr_factory_e000: macaddr@e000 { + compatible = "mac-base"; reg = <0xe000 0x6>; + #nvmem-cell-cells = <1>; }; macaddr_factory_e006: macaddr@e006 { -- 2.30.2