From patchwork Fri Jan 27 12:57:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 13118676 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4F10DC38142 for ; Fri, 27 Jan 2023 13:27:43 +0000 (UTC) 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=mUvEBH8e7BrO3kb3M5w6ZLAN+aYmFyV8rKrqtzBWFlA=; b=OcdMCh1fAPv3Dc Du9r/F9UuV+IALZVXZ0JHeeKvjZu4YfpKHXZdIWYpR+3tp0mbIHiv3J1kTBDHdq1PNcMndSZOejLD /g2QqfbLD1ShUQlKNYe4/HvZ/A/k3ebmVhD3CfCuv5CAbo2z3jB0GvYKOwSceVrhDkEHGQo28Z377 zzon4Ux1kx+/QjWg1N8ULZNUpiLOEKAw6kxIqcroimwtBe1p3DBWyUI9jj1eCckhVlQo7vv3KouyR VDQRPIBVb9PZssyRWXFzx8yo3hKEBoBXoPoRgKkv3ehahh1UolVojrt9+GQvrNwK850CBzy6OG8vu tbHoLlHCQsYUvWnkCwLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLOkX-00EyrR-UQ; Fri, 27 Jan 2023 13:26:38 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLOII-00Em5e-QO for linux-arm-kernel@lists.infradead.org; Fri, 27 Jan 2023 12:57:31 +0000 Received: by mail-ej1-x62e.google.com with SMTP id k4so8004629eje.1 for ; Fri, 27 Jan 2023 04:57:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lu06/R6jtaPsdOb+3M2mEKtYsdSHx6tfbfAcrndOQiY=; b=RDP38X1zJPgqzvN1XCkEq4SVPmTQJgz+TtoZ7p0KPbx1HzpefwgV2vrv9+u3ztby+C qEuJMPPnNz01zSJ+T+PdJoEC6KDvVw4vaT0vM1cAwh4t5HDF7UiAmhA5k0+R0bCU9NKn CIr0AQlSY9uqDjDhm3imWKkQQeDamC2guKI8dJTdCR0mASfR1Et9eG8Mhj4r3GJcFUtS SDhDg7+5ElZpS0RIMNnMuu4LlCtXGXsrT0GXlR7tlOOkpZ5/AkzbbReCT9bDTGlPWXba 8xgLTnW16ajKyA4K7/LcpvJcvIqTPg+0v2/R8gaMmkqll+bDZQMn6SOPUY8tv+m5Wvtf Q3Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lu06/R6jtaPsdOb+3M2mEKtYsdSHx6tfbfAcrndOQiY=; b=HmWilRlrgU+m4PtcmY8TOwzGIpkeweG7/qdZ80hkolnXvs1n5Z5m7gcWOYk6tSI5f6 kCmtZ8BfMRYjCe1Gw0H+APqreKZIvW25snodJjewahTYdBDA+fPolyWvQzpwtA2Ramc4 RQh5MealOboonbiH/Icu32pQYtqFLsZQcbRhIp8lhIuTJbm0HkMYVQAZzW5uXpkRqgXb iXC6WnRCSPse7EuAw045GGSKEo8+GuM+0Xd2qMiNz1GqZnHPr4rkhciyC047Zs0R+tVJ bFyec5OZwzZ1v9lMsoWKn4DOM0RewSDm06PuoAe/p55a7y+c100QbIB9Rn2FcawkBQPY dDWQ== X-Gm-Message-State: AO0yUKXaROHOVjhj/DOcPHHDuAoQWeVNIFea9p1b2uJKLE4WGuhgAab3 wAlkYCWVxoQCrqLqZB39Z/c= X-Google-Smtp-Source: AK7set9CIj+dNhjJCL5JmCTdK3ABAk72t2Rmw7D90StGXtMj9uFqz2mT5mgzRXOP+GBUpSLG4g5q1A== X-Received: by 2002:a17:907:7f25:b0:87a:4802:cb4f with SMTP id qf37-20020a1709077f2500b0087a4802cb4fmr3981598ejc.76.1674824242666; Fri, 27 Jan 2023 04:57:22 -0800 (PST) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y5-20020a056402358500b00482e0c55e2bsm2248136edc.93.2023.01.27.04.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 04:57:22 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski Cc: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Miquel Raynal , Michael Walle , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, u-boot@lists.denx.de, =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , Rob Herring Subject: [PATCH V3 3/6] dt-bindings: nvmem: convert U-Boot env vars to NVMEM layout Date: Fri, 27 Jan 2023 13:57:06 +0100 Message-Id: <20230127125709.32191-3-zajec5@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127125709.32191-1-zajec5@gmail.com> References: <20230127125709.32191-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230127_045726_915157_98D9DE8F X-CRM114-Status: GOOD ( 15.65 ) 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: Rafał Miłecki U-Boot environment variables can be found of various underlaying storage entities. This binding should be defined as a layout on top on NVMEM device not a NVMEM device itself. Signed-off-by: Rafał Miłecki Reviewed-by: Rob Herring --- .../bindings/nvmem/layouts/nvmem-layout.yaml | 1 + .../nvmem/{ => layouts}/u-boot,env.yaml | 29 ++++++++++--------- MAINTAINERS | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) rename Documentation/devicetree/bindings/nvmem/{ => layouts}/u-boot,env.yaml (77%) diff --git a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml index 8512ee538c4c..8835b1781a9f 100644 --- a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml +++ b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml @@ -20,6 +20,7 @@ description: | oneOf: - $ref: kontron,sl28-vpd.yaml - $ref: onie,tlv-layout.yaml + - $ref: u-boot,env.yaml properties: compatible: true diff --git a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml b/Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml similarity index 77% rename from Documentation/devicetree/bindings/nvmem/u-boot,env.yaml rename to Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml index cbc5c69fd405..fb273b174fe7 100644 --- a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml +++ b/Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2 --- -$id: http://devicetree.org/schemas/nvmem/u-boot,env.yaml# +$id: http://devicetree.org/schemas/nvmem/layouts/u-boot,env.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: U-Boot environment variables +title: NVMEM layout of U-Boot environment variables description: | U-Boot uses environment variables to store device parameters and @@ -14,16 +14,11 @@ description: | Data is stored using U-Boot specific formats (variant specific header and NUL separated key-value pairs). - Environment data can be stored on various storage entities, e.g.: + Environment data can be stored on NVMEM devices of various underlaying storage + entities, e.g.: 1. Raw flash partition 2. UBI volume - This binding allows marking storage device (as containing env data) and - specifying used format. - - Right now only flash partition case is covered but it may be extended to e.g. - UBI volumes in the future. - Variables can be defined as NVMEM device subnodes. maintainers: @@ -67,11 +62,14 @@ examples: read-only; }; - env: partition@40000 { - compatible = "u-boot,env"; + partition@40000 { reg = <0x40000 0x10000>; - mac: ethaddr { + nvmem-layout { + compatible = "u-boot,env"; + + mac: ethaddr { + }; }; }; }; @@ -87,9 +85,12 @@ examples: label = "u-boot"; partition-u-boot-env { - compatible = "brcm,env"; - ethaddr { + nvmem-layout { + compatible = "brcm,env"; + + ethaddr { + }; }; }; }; diff --git a/MAINTAINERS b/MAINTAINERS index 35385df2302c..1373154c0b49 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21214,7 +21214,7 @@ F: drivers/media/pci/tw686x/ U-BOOT ENVIRONMENT VARIABLES M: Rafał Miłecki S: Maintained -F: Documentation/devicetree/bindings/nvmem/u-boot,env.yaml +F: Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml F: drivers/nvmem/u-boot-env.c UACCE ACCELERATOR FRAMEWORK