ramips: mt7620: move Phicomm MAC address setup to DTSI

The setup is the same for all devices, so move it up one level.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
index fd6cc7f82b082cd62b7526ba27ea7a0189c9673d..d113edc19fd34d331f258218bd7a79d392107ab2 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
@@ -23,9 +23,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii2_pins &mdio_pins>;
 
-       nvmem-cells = <&macaddr_factory_28>;
-       nvmem-cell-names = "mac-address";
-
        mediatek,portmap = "llllw";
 
        port@5 {
@@ -48,13 +45,3 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pa_pins>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi b/target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi
index c7728e04423e4658b7a9d52188a063effadd1306..a8a900eac19e75377e2c5cc419b99a3253b56b66 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi
+++ b/target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi
@@ -96,6 +96,21 @@
        };
 };
 
+&ethernet {
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
+};
+
 &wmac {
        ralink,mtd-eeprom = <&factory 0x0>;
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_28: macaddr@28 {
+               reg = <0x28 0x6>;
+       };
+};

diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
index 3a9a57d90b6821ca3490a0d518263a09017ff056..cda05173b163abd6bc98ee91f2c9d33382049ced 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
@@ -14,9 +14,6 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
-       nvmem-cell-names = "mac-address";
-
        mediatek,portmap = "llllw";
 };
 
@@ -24,13 +21,3 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pa_pins>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
index 916479c252eff9a541459cbb51d893f4da499ad7..704be2b5d75ed49594c2da1a1e0af2fe1e2df8fc 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
@@ -12,18 +12,3 @@
                reg = <0x50000 0x7b0000>;
        };
 };
-
-&ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
-       nvmem-cell-names = "mac-address";
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};