diff mbox series

[11/16] arm64: zynqmp: Do not duplicate flash partition label property

Message ID 887e8758e665bd8640d27b035f12dee893d4196a.1582028304.git.michal.simek@xilinx.com
State Accepted
Commit 0546b1ab06b22fc3cc2c5b23be351ae671a58f82
Headers show
Series xilinx: DT sync up | expand

Commit Message

Michal Simek Feb. 18, 2020, 12:20 p.m. UTC 
From: Amit Kumar Mahapatra <amit.kumar-mahapatra at xilinx.com>

In kernel 5.4, support has been added for reading MTD devices via
the nvmem API.
For this the mtd devices are registered as read-only NVMEM providers
under sysfs with the same name as the flash partition label property.

So if flash partition label property of multiple flash devices are identical
then the second mtd device fails to get registered as a NVMEM provider.

This patch fixes the issue by having different label property for different
flashes.

Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra at xilinx.com>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
index 2ff7952e70e5..92d938d665d2 100644
--- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
@@ -197,7 +197,7 @@ 
 		reg = <0>;
 
 		partition at 0 {
-			label = "data";
+			label = "spi0-data";
 			reg = <0x0 0x100000>;
 		};
 	};
@@ -214,7 +214,7 @@ 
 		reg = <0>;
 
 		partition at 0 {
-			label = "data";
+			label = "spi1-data";
 			reg = <0x0 0x84000>;
 		};
 	};