From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64102C4332F for ; Tue, 9 Nov 2021 22:35:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5001660EE5 for ; Tue, 9 Nov 2021 22:35:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345308AbhKIWhv (ORCPT ); Tue, 9 Nov 2021 17:37:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:56152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345015AbhKIWfu (ORCPT ); Tue, 9 Nov 2021 17:35:50 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2FCAA61ACD; Tue, 9 Nov 2021 22:22:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636496547; bh=jl1gUPw+TDlktSwf6vjGt49t+8ULymjwZAHlvZHQuvw=; h=From:To:Cc:Subject:Date:From; b=KYhOQ781zLHE2WsPeNzu1rCSPF1x9cCmEf9PiUTk9EyV2BKHSkqt1lg9LinLg97rZ UtilKdPDtGcarrHMpYdz95Y0zmKYYp/is1adcY+EL1u4iWvp2YYIkBMSuwq1hMz025 pR++Zl6lpy3ycnxlGBPGB85kGeatq9kuDukncCuyP6u+K0+keLoM8M8RKVfgQ3SSmY s1oxJGk4f7G+QXN8SXUbIptVMBTsGdXq90DcV6EBnxccESJwkx9oRzKE8qgMScFhaw ygGVo/xrX2LFDnwYpVGjJdoNGBvZoyiJAeFSiDcnzBMJdo2Do0PfDfzOQSp9ZCDQ1a f3JPRFsodtqzA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Amit Kumar Mahapatra , Michal Simek , Sasha Levin , robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, catalin.marinas@arm.com, will.deacon@arm.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 01/30] arm64: zynqmp: Do not duplicate flash partition label property Date: Tue, 9 Nov 2021 17:21:55 -0500 Message-Id: <20211109222224.1235388-1-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Amit Kumar Mahapatra [ Upstream commit 167721a5909f867f8c18c8e78ea58e705ad9bbd4 ] 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 Link: https://lore.kernel.org/r/6c4b9b9232b93d9e316a63c086540fd5bf6b8687.1623684253.git.michal.simek@xilinx.com Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts index 2421ec71a201c..41a66787247b6 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts @@ -131,7 +131,7 @@ reg = <0>; partition@0 { - label = "data"; + label = "spi0-data"; reg = <0x0 0x100000>; }; }; @@ -149,7 +149,7 @@ reg = <0>; partition@0 { - label = "data"; + label = "spi1-data"; reg = <0x0 0x84000>; }; }; -- 2.33.0