From patchwork Tue Feb 18 12:20:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 236496 List-Id: U-Boot discussion From: michal.simek at xilinx.com (Michal Simek) Date: Tue, 18 Feb 2020 13:20:41 +0100 Subject: [PATCH 11/16] arm64: zynqmp: Do not duplicate flash partition label property In-Reply-To: References: Message-ID: <887e8758e665bd8640d27b035f12dee893d4196a.1582028304.git.michal.simek@xilinx.com> From: Amit Kumar Mahapatra 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 Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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>; }; };