From patchwork Mon Jun 14 15:25:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12319291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D64CC2B9F4 for ; Mon, 14 Jun 2021 15:47:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC15C61241 for ; Mon, 14 Jun 2021 15:47:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC15C61241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/yvLVCw+Gv4NA/XBhFA9rUTnLBjLsMoiUV00qnYgSNM=; b=g/ttmlHnPG24sI cxii0Bisn0CpVOQdwo1DPldBMKn2UrADeerFd8mxEPoo16qJZCSgsWm6CXZGnwU9WubtsTYNocnK4 vxWL5eu9c3lpIWqLg1FcWsuwrkvfVH6mph9eyrDF9oOHQWq0TRJ+rjfh+nmLOeuODsCxslxljROCm ktympG0KhvvgvnuyPsL0Ma5Slj1fG/ZJ0i/pzWo09e7A+DJXI+quwzaH5Ru87vV4ZXwAou+TYBhS0 pGKlCQzEtnkpYT9JdF+Vy29zP4SM85vW3ZysDAy8X7Bfe20c9cb0+rYAIbck0bPgSKCWC43MhSt/O PsDA0inqCXl3su2H0b/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsolw-00Eq21-Eg; Mon, 14 Jun 2021 15:45:09 +0000 Received: from mail-ej1-f44.google.com ([209.85.218.44]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsoUC-00EjIe-Km for linux-arm-kernel@lists.infradead.org; Mon, 14 Jun 2021 15:26:49 +0000 Received: by mail-ej1-f44.google.com with SMTP id l1so17268457ejb.6 for ; Mon, 14 Jun 2021 08:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eENrFE65sb18aGa1Uvfu7nA7Z38lv6PqEmiZJci8iuw=; b=A2m6p1gf8L1eJQnBJaAIp4XXuJDOG6Wqm4bLiQeL0ABSKGalI+qbuANO/3lgSYCfUM 4fPIaARCshsNqfc74+b07sRJe8VoSEmqgVBwK4zHhWYFuFGqVmvTRzsgDBVExdxHFml4 rCMKgtFRxD3Fk73MlyMjtgD74iP/+/R/q97qK4yzwIpQmFAYkoVuxv+26STeu/dlMwCZ Jhu10XSxDRhoHTBf5LHOwhVjVBXOBAQuw3nD7SLhSo64uhNqQTpAx+haVLqEyy8i8Ad/ Broev+j14nDSkwjLpm+AvvIcoPngccwUxG5vmzuxbEerOQxYmur6tRm80mcGw9rw59jg E+Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eENrFE65sb18aGa1Uvfu7nA7Z38lv6PqEmiZJci8iuw=; b=Lyoi7NToOnbDQwK06z1ArXWejJGRoeDp6deA7lSh74XD3LiPRRL6sMp+Her0cb258o aIuikYqUUmXMRZR5SbMDglV7ONuB4X3ctZTKeHlQmOMmBxWNzgk6npuphBzpSf1vw7Is 2Ksjq4X9djXQteQOozWa3IUSfbMS5IvpMz/Teqp770PtglfCnmBjRZbBER5MfVk3XQPh J7AqaArCKvuFHggxaa8ehfxAiLureJ+3WdQoPajWI5xF0M9MqzuJG59LxV3dBQhIYWAy lO3c38526QgDcfqFCGlKCFrBU/miKFUEKNkSULYRJl2YOGWFApZSPPyLR1M3F15K+M2/ WSGA== X-Gm-Message-State: AOAM533CSOQD0G5DiAgoDqwpxmVPxhw5rXaAWnsaarxVu0kAVxT7f/Id CH54FVaee9nlzXuUKOVPiVIGUA== X-Google-Smtp-Source: ABdhPJzs9VfMq5+Et4qPzGcZzrvGoiB2wet15vIy4GfVjZHrblHV2mXfQtzx3wKyZVQ37CfXEr5RPQ== X-Received: by 2002:a17:906:1c49:: with SMTP id l9mr16040165ejg.39.1623684346515; Mon, 14 Jun 2021 08:25:46 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6:f666:9af6:3fed:e53b]) by smtp.gmail.com with ESMTPSA id h22sm9024630edv.0.2021.06.14.08.25.46 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jun 2021 08:25:46 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Amit Kumar Mahapatra , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 02/33] arm64: zynqmp: Do not duplicate flash partition label property Date: Mon, 14 Jun 2021 17:25:10 +0200 Message-Id: <6c4b9b9232b93d9e316a63c086540fd5bf6b8687.1623684253.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210614_082648_734053_6A38FA16 X-CRM114-Status: GOOD ( 14.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- Changes in v2: None 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 4a86efa32d68..f7124e15f0ff 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 @@ 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>; }; };