octeon: use fixed layout cell "mac-base" for Cisco vEdge 1000

This drops a use of downstream "mac-address-increment".

Cc: Christian Svensson <blue@cmd.nu>
Cc: Tommy Nevtelen <tommy@nevtelen.com>
Cc: Viktor Ekmark <viktor@ekmark.se>
Cc: Daniel Wennberg <github@networkninja.se>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Tested-by: Christian Svensson <blue@cmd.nu>

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts
index e1f308dd528fcb7dfb5f31a85aa8aa4b96cf57bd..4680d6ea1455a7c4796f0bde5d3ab36b8111c48a 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts
@@ -24,7 +24,7 @@
                              <0x11800 0xe0002000 0x00 0x08>;
                        cell-index = <0x00>;
                        interrupts = <0x00 0x3e 0x01 0x2e>;
-                       nvmem-cells = <&macaddr_eeprom>;
+                       nvmem-cells = <&macaddr_eeprom 0>;
                        nvmem-cell-names = "mac-address";
                        phy-handle = <&mgmtphy>;
                };
@@ -32,25 +32,22 @@
                pip: pip@11800a0000000 {
                        interface@0 {
                                ethernet@0 {
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 3>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(3)>;
                                        label = "lan2";
                                        /delete-property/ local-mac-address;
                                };
 
                                ethernet@1 {
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 4>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(4)>;
                                        label = "lan3";
                                        /delete-property/ local-mac-address;
                                };
 
                                ethernet@2 {
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 1>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(1)>;
                                        label = "lan0";
                                        /delete-property/ local-mac-address;
                                };
@@ -58,9 +55,8 @@
                                ethernet@3 {
                                        compatible = "cavium,octeon-3860-pip-port";
                                        reg = <0x3>;
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 2>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(2)>;
                                        label = "lan1";
                                };
                        };
@@ -69,36 +65,32 @@
                                ethernet@0 {
                                        compatible = "cavium,octeon-3860-pip-port";
                                        reg = <0x0>;
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 7>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(7)>;
                                        label = "lan6";
                                };
 
                                ethernet@1 {
                                        compatible = "cavium,octeon-3860-pip-port";
                                        reg = <0x1>;
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 8>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(8)>;
                                        label = "lan7";
                                };
 
                                ethernet@2 {
                                        compatible = "cavium,octeon-3860-pip-port";
                                        reg = <0x2>;
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 5>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(5)>;
                                        label = "lan4";
                                };
 
                                ethernet@3 {
                                        compatible = "cavium,octeon-3860-pip-port";
                                        reg = <0x3>;
-                                       nvmem-cells = <&macaddr_eeprom>;
+                                       nvmem-cells = <&macaddr_eeprom 6>;
                                        nvmem-cell-names = "mac-address";
-                                       mac-address-increment = <(6)>;
                                        label = "lan5";
                                };
                        };
@@ -135,11 +127,17 @@
                                compatible = "atmel,24c512";
                                reg = <0x54>;
                                pagesize = <0x80>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_eeprom: mac-address@8 {
-                                       reg = <0x8 6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom: mac-address@8 {
+                                               compatible = "mac-base";
+                                               reg = <0x8 6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
                };