octeon: convert mtd-mac-address to nvmem implementation

Define nvmem-cells and convert mtd-mac-address to nvmem implementation.
The conversion is done with an automated script.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
index d8dabfc370c14d69afdafcc66a62417ba8a3710d..75e2c794b9e665602393484753a5a2fb791bf854 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
@@ -14,7 +14,18 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy4>;
-                       mtd-mac-address = <&eeprom 0>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
+
+&eeprom {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_eeprom_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
index 7d31885928893af6d62a4bc395e531e53001b1b5..c1a41cbf705da78e1dc35da63370eece995ae879 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
@@ -32,7 +32,8 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy4>;
-                       mtd-mac-address = <&eeprom 0>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 
@@ -44,8 +45,9 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy8>;
-                       mtd-mac-address = <&eeprom 0>;
-                       mtd-mac-address-increment = <(4)>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
+                       mac-address-increment = <(4)>;
                };
 
                ethernet@1 {
@@ -53,8 +55,19 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy9>;
-                       mtd-mac-address = <&eeprom 0>;
-                       mtd-mac-address-increment = <(5)>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
+                       mac-address-increment = <(5)>;
                };
        };
 };
+
+&eeprom {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_eeprom_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
index 7a4d2e66838d4a26f239c0467af108a60a669ea4..7eafa32cf6d7bebd73255df38df4da06c279053a 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
@@ -180,7 +180,8 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy5>;
-                       mtd-mac-address = <&eeprom 0>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
                        mac-address-increment = <(1)>;
                };
 
@@ -189,7 +190,8 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy6>;
-                       mtd-mac-address = <&eeprom 0>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
                        mac-address-increment = <(2)>;
                };
 
@@ -198,8 +200,19 @@
                        status = "okay";
                        phy-mode = "sgmii";
                        phy-handle = <&phy7>;
-                       mtd-mac-address = <&eeprom 0>;
+                       nvmem-cells = <&macaddr_eeprom_0>;
+                       nvmem-cell-names = "mac-address";
                        mac-address-increment = <(3)>;
                };
        };
 };
+
+&eeprom {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_eeprom_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};