> diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt > index 2974e63..1e2bc9a 100644 > --- a/Documentation/devicetree/bindings/net/ethernet.txt > +++ b/Documentation/devicetree/bindings/net/ethernet.txt > @@ -10,6 +10,8 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt. > the boot program; should be used in cases where the MAC address assigned to > the device by the boot program is different from the "local-mac-address" > property; > +- nvmem-cells: phandle, reference to an nvmem node for the MAC address > +- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used You put the new values after local-mac-address and mac-address. That suggests they are of lower priority. That conflicts with the current patch. If you think NVMEM should take priority, please put the properties first. Andrew
