[PATCHv2 3/5] arm64: dts: armada-3720-gl-mv1000: use nvmem-layout

[Rosen Penev]

nvmem-layout is a more flexible replacement for nvmem-cells.

Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 .../dts/marvell/armada-3720-gl-mv1000.dts     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
index 56930f2ce481..7b801b60862d 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
@@ -98,10 +98,24 @@ partition at f0000 {
 				reg = <0xf0000 0x8000>;
 			};
 
-			factory: partition at f8000 {
+			partition at f8000 {
 				label = "factory";
 				reg = <0xf8000 0x8000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_0: macaddr at 0 {
+						reg = <0x0 0x6>;
+					};
+
+					macaddr_factory_6: macaddr at 6 {
+						reg = <0x6 0x6>;
+					};
+				};
 			};
 
 			partition at 100000 {
@@ -221,17 +235,3 @@ fixed-link {
 		full-duplex;
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_0: macaddr at 0 {
-		reg = <0x0 0x6>;
-	};
-
-	macaddr_factory_6: macaddr at 6 {
-		reg = <0x6 0x6>;
-	};
-};
-- 
2.46.2