@@ -98,10 +98,24 @@ partition@f0000 {
reg = <0xf0000 0x8000>;
};
- factory: partition@f8000 {
+ partition@f8000 {
label = "factory";
reg = <0xf8000 0x8000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_factory_0: macaddr@0 {
+ reg = <0x0 0x6>;
+ };
+
+ macaddr_factory_6: macaddr@6 {
+ reg = <0x6 0x6>;
+ };
+ };
};
partition@100000 {
@@ -221,17 +235,3 @@ fixed-link {
full-duplex;
};
};
-
-&factory {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_factory_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-
- macaddr_factory_6: macaddr@6 {
- reg = <0x6 0x6>;
- };
-};
nvmem-layout is a more flexible replacement for nvmem-cells. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- .../dts/marvell/armada-3720-gl-mv1000.dts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)