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>
<0x11800 0xe0002000 0x00 0x08>;
cell-index = <0x00>;
interrupts = <0x00 0x3e 0x01 0x2e>;
<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>;
};
nvmem-cell-names = "mac-address";
phy-handle = <&mgmtphy>;
};
pip: pip@11800a0000000 {
interface@0 {
ethernet@0 {
pip: pip@11800a0000000 {
interface@0 {
ethernet@0 {
- nvmem-cells = <&macaddr_eeprom>;
+ nvmem-cells = <&macaddr_eeprom 3>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(3)>;
label = "lan2";
/delete-property/ local-mac-address;
};
ethernet@1 {
label = "lan2";
/delete-property/ local-mac-address;
};
ethernet@1 {
- nvmem-cells = <&macaddr_eeprom>;
+ nvmem-cells = <&macaddr_eeprom 4>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(4)>;
label = "lan3";
/delete-property/ local-mac-address;
};
ethernet@2 {
label = "lan3";
/delete-property/ local-mac-address;
};
ethernet@2 {
- nvmem-cells = <&macaddr_eeprom>;
+ nvmem-cells = <&macaddr_eeprom 1>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(1)>;
label = "lan0";
/delete-property/ local-mac-address;
};
label = "lan0";
/delete-property/ local-mac-address;
};
ethernet@3 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x3>;
ethernet@3 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x3>;
- nvmem-cells = <&macaddr_eeprom>;
+ nvmem-cells = <&macaddr_eeprom 2>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(2)>;
ethernet@0 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x0>;
ethernet@0 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x0>;
- nvmem-cells = <&macaddr_eeprom>;
+ nvmem-cells = <&macaddr_eeprom 7>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(7)>;
label = "lan6";
};
ethernet@1 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x1>;
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";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(8)>;
label = "lan7";
};
ethernet@2 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x2>;
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";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(5)>;
label = "lan4";
};
ethernet@3 {
compatible = "cavium,octeon-3860-pip-port";
reg = <0x3>;
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";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(6)>;
compatible = "atmel,24c512";
reg = <0x54>;
pagesize = <0x80>;
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>;
+ };