Commit 167721a5 authored by Amit Kumar Mahapatra's avatar Amit Kumar Mahapatra Committed by Michal Simek
Browse files

arm64: zynqmp: Do not duplicate flash partition label property 



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: default avatarAmit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/6c4b9b9232b93d9e316a63c086540fd5bf6b8687.1623684253.git.michal.simek@xilinx.com
parent 4234645d

arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ spi0_flash0: flash@0 { 
		reg = <0>;



		partition@0 {

			label = "data";

			label = "spi0-data";

			reg = <0x0 0x100000>;

		};

	};
@@ -149,7 +149,7 @@ spi1_flash0: flash@0 { 
		reg = <0>;



		partition@0 {

			label = "data";

			label = "spi1-data";

			reg = <0x0 0x84000>;

		};

	};