From patchwork Wed Jun 9 11:44:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309901 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=-17.0 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,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 B6599C48BCD for ; Wed, 9 Jun 2021 11:50:02 +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 7D78B61249 for ; Wed, 9 Jun 2021 11:50:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D78B61249 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=aMYZu0cHy2rjdVGm02MJ3LXqBv18l/eyzCRSY9W0sZQ=; b=XpquyjjFoNTpmH iFdjDm3GypNhIuGUYYG80p45nTRhGFMZfrfPYIwgcgswN+WcSCZwHql7GJDkxeSbubhg/2LD9llPx sX5hHXgC8S0AZ+f8gjxhRDQFwdHCnDBellT/A5ex/ZQxxKTFRjaiWiDTwiyjB9ubORSAvF1T2+gyr JQXJ4fEcuwxX9sjpRk7+wz4d+4oBDoP2OOdK6rrVpQI/GPzJU2w9uPOLQQG0eiUF4bxxg035lFv71 a2tn4ko96IW4fEpTwk/Hd4AnIslC5hriLQOyBSFD/GYGekal+ZSJ9tYllnRD/DE+JEaRvCvhuG2R4 j8dTmvQ41LxPmsFdfL4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwgh-00DQsm-Q4; Wed, 09 Jun 2021 11:48:02 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweE-00DPr5-6c for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:29 +0000 Received: by mail-wm1-x331.google.com with SMTP id v206-20020a1cded70000b02901a586d3fa23so3983688wmg.4 for ; Wed, 09 Jun 2021 04:45:25 -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=kEDmcXw1Vb0a19AjvwRij7MjXqXCoObE8zeLieziyHk=; b=kKGqttYupE3iAnWWcj2Z/5S/M9a++Vowp7tLhYCysZ5ycoUMSJhJ5pj5brD1sUEmyi Ozr4OFfsbSV8EqJz/U/YRe5NVT/WvePyC4/4vVIdtjh0O0XhRi6Ny3gvWNsKCmGrkd5Q kMIlbz3cPWF6QcpHq5Rj1Q+azERtcIi9E0hzTxD4vavVlgjj2M9vxQ8dCcuNJR0ZBu4s JbvNh8qyZVq5M6VknyuYHsUwuRH4ep2ylfheCD1On3cHp6hJ7enWSYLbneWMYvIXYVYv aGZv64qRAhI2oavIwckktxBwo/ZW4ruXDHpHlEKx8gKLRTf38fMGy0MU5S67+I+Uy40G K/tw== 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=kEDmcXw1Vb0a19AjvwRij7MjXqXCoObE8zeLieziyHk=; b=bsdBQVqbikUWGz74yU6nlCb90cSP19AncREftycTeLqawsC89rCcTa/g4FzZt10yCg brl0w5JXeNV0FsK0b4jEglCm9JbOe9y4R0au4OVdsk2nIbJtixQxxmAzQxMp/WbSl9Vm Q8+k5fSKWKJUmCQYUT6dxbiXpr7Fo/4haQiQ7AViqMgYfcDl1WzivpNo6ho7XlWF9o0M Jz4QopnFNi6nmZMmoeJfP5I8kq4PbtlYXXhCZ/I2ky/u+TaL9c9ii0WHtIayeMbRIUPt PORLjPXLj2HhjixnXJpn95GBkfOwlkv6qYxAr3PdjTWcn+rHpcjuH+sMNqPsgvB2edxz HKMQ== X-Gm-Message-State: AOAM532YeWW+2KTbjZRXEkckfPcll3lRmmCWWL0mB3IJ3wXTb1mRzLUz w5r+t+Qd+5AfEXLxQGk6k7mO1w== X-Google-Smtp-Source: ABdhPJx/gF/i/+f3rHQ5uRMfSpqn975b21+2ucb/F8nsogWOh6nBJ3ghohhqCBek0mAcbMtAQQqwrg== X-Received: by 2002:a1c:2015:: with SMTP id g21mr9400708wmg.87.1623239124315; Wed, 09 Jun 2021 04:45:24 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id o18sm13601475wrx.59.2021.06.09.04.45.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:24 -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 02/31] arm64: zynqmp: Do not duplicate flash partition label property Date: Wed, 9 Jun 2021 13:44:38 +0200 Message-Id: <6c4b9b9232b93d9e316a63c086540fd5bf6b8687.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044526_848966_8DAE0CA5 X-CRM114-Status: GOOD ( 13.99 ) 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 --- 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>; }; };