From nobody Sun Feb 8 14:11:28 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AC89C6FD1D for ; Mon, 27 Mar 2023 14:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232626AbjC0OS2 (ORCPT ); Mon, 27 Mar 2023 10:18:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232724AbjC0OSG (ORCPT ); Mon, 27 Mar 2023 10:18:06 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7A496A64; Mon, 27 Mar 2023 07:16:19 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id h11so4696055lfu.8; Mon, 27 Mar 2023 07:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679926577; 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=QzCwekFGfxzs1CDNjeDV7r4j31xaEPMaYXmxUiOdDtk=; b=jkSlOjGPwovb56Z9OU+zzP1erojmRSVnXihJEmA/6boY4vkMTFK1XwgnXyvJi8JqHj /pjpPjtDhAyVMD5uJbJ1J3qeJ9tBx7vAFcFAFjgywDKPQ0L2dS0++bvVSsNbqIbWFGZH BnAAEbGlNIqKKZ93KwUIa7hvj0ySvlpvdq0xZo61R4NzbrZAB7P3BmiCJ+urmHXYqNtZ WFL6stshmFIY83e/+JV1BkX3hv/6ALDvocypKQzStSW47Vl4blGX6qPiFp+T8GfVuheP pdZ5t5OwV6U+ypBwDjCoVd9ii2ChkAZ6lresRuyC93P6H3/iLAw3V1+0Xrm+yiuB7eIP AmCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679926577; 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=QzCwekFGfxzs1CDNjeDV7r4j31xaEPMaYXmxUiOdDtk=; b=NCIWc39iUr/GTaJKcDGQ6Ftt9CC6zU7oGSP0I9Z/ughGcyodxo2ZLKd7F0pJdOO7uJ ZBRihDi8hFWrHXGZcMfS0Wn1RbHdQK9lWCbxB4oQy4JgIm9C9pNAl9aA7lQenG5mgUc7 VegHIdFWSwI3T05ZQkUXjgHNIxQ0uyCp0aLwg8xHBY56PnZSSPCWBRxAQRE5BvcVt7qD onWfFts/QzUggoxgVfJhp3zXEjb1M4iaZr+qmdiVpx7Z1dTzFdOsNstlU8n0nXYHaPLu C4EWpYbnWGtnDe5WVPMeao26JotVU0lB8dNCLP74xUV72OMUjWK/5iIIRmJlpkXLZijb 9GEA== X-Gm-Message-State: AAQBX9cMSshd5jmt7EqOevy9YMLBYFgHB1QQYg77vkdbaDw3MUSjR6Ks AlvG4/HEws0+zrR1n+GWrC4= X-Google-Smtp-Source: AKy350ainV6iC5gic5XaaKtVh+/1mcO1aPMsD/jqNOYyxIjzmWLxbVX6CY5FfN6Dv8HILjcVxB2pkA== X-Received: by 2002:ac2:484a:0:b0:4dd:a73f:aede with SMTP id 10-20020ac2484a000000b004dda73faedemr3095133lfy.10.1679926577303; Mon, 27 Mar 2023 07:16:17 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004e977970721sm4444519lfl.219.2023.03.27.07.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 07:16:16 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla Cc: Greg Kroah-Hartman , Miquel Raynal , Michael Walle , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V6 1/3] dt-bindings: nvmem: layouts: add fixed-layout Date: Mon, 27 Mar 2023 16:16:09 +0200 Message-Id: <20230327141611.25131-2-zajec5@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327141611.25131-1-zajec5@gmail.com> References: <20230327141611.25131-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafa=C5=82 Mi=C5=82ecki With the introduction of NVMEM layouts, new NVMEM content structures should be defined as such. We should also try to convert / migrate existing NVMEM content bindings to layouts. This commit handles fixed NVMEM cells. So far they had to be defined directly - as device subnodes. With this change it's allowed to put them in the DT node named "nvmem-layout". Having NVMEM cells in separated node is preferred as it draws a nice line between NVMEM device and its content. It results in cleaner bindings. FWIW a very similar situation has happened to MTD devices and their partitions: see commit 5d96ea42eb63 ("dt-bindings: mtd: Clarify all partition subnodes"). Signed-off-by: Rafa=C5=82 Mi=C5=82ecki Reviewed-by: Rob Herring --- V6: Add unevaluatedProperties: false --- .../bindings/nvmem/layouts/fixed-cell.yaml | 31 ++++++++++++ .../bindings/nvmem/layouts/fixed-layout.yaml | 50 +++++++++++++++++++ .../bindings/nvmem/layouts/nvmem-layout.yaml | 5 +- .../devicetree/bindings/nvmem/nvmem.yaml | 19 +------ 4 files changed, 84 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/fixed-c= ell.yaml create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/fixed-l= ayout.yaml diff --git a/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yam= l b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml new file mode 100644 index 000000000000..e698098450e1 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/layouts/fixed-cell.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Fixed offset & size NVMEM cell + +maintainers: + - Rafa=C5=82 Mi=C5=82ecki + - Srinivas Kandagatla + +properties: + reg: + maxItems: 1 + + bits: + $ref: /schemas/types.yaml#/definitions/uint32-array + items: + - minimum: 0 + maximum: 7 + description: + Offset in bit within the address range specified by reg. + - minimum: 1 + description: + Size in bit within the address range specified by reg. + +required: + - reg + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.y= aml b/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml new file mode 100644 index 000000000000..c271537d0714 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/layouts/fixed-layout.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NVMEM layout for fixed NVMEM cells + +description: + Many NVMEM devices have hardcoded cells layout (offset and size of defin= ed + NVMEM content doesn't change). + + This binding allows defining such NVMEM layout with its cells. It can be= used + on top of any NVMEM device. + +maintainers: + - Rafa=C5=82 Mi=C5=82ecki + +properties: + compatible: + const: fixed-layout + + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + +patternProperties: + "@[a-f0-9]+$": + type: object + $ref: fixed-cell.yaml + unevaluatedProperties: false + +required: + - compatible + +additionalProperties: false + +examples: + - | + nvmem-layout { + compatible =3D "fixed-layout"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + calibration@4000 { + reg =3D <0x4000 0x100>; + }; + }; diff --git a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.y= aml b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml index 8512ee538c4c..3b40f7880774 100644 --- a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml +++ b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml @@ -18,16 +18,13 @@ description: | perform their parsing. The nvmem-layout container is here to describe th= ese. =20 oneOf: + - $ref: fixed-layout.yaml - $ref: kontron,sl28-vpd.yaml - $ref: onie,tlv-layout.yaml =20 properties: compatible: true =20 - '#address-cells': false - - '#size-cells': false - required: - compatible =20 diff --git a/Documentation/devicetree/bindings/nvmem/nvmem.yaml b/Documenta= tion/devicetree/bindings/nvmem/nvmem.yaml index 75bb93dda9df..b79f1bb795fb 100644 --- a/Documentation/devicetree/bindings/nvmem/nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/nvmem.yaml @@ -49,23 +49,8 @@ properties: patternProperties: "@[0-9a-f]+(,[0-7])?$": type: object - - properties: - reg: - maxItems: 1 - description: - Offset and size in bytes within the storage device. - - bits: - $ref: /schemas/types.yaml#/definitions/uint32-array - items: - - minimum: 0 - maximum: 7 - description: - Offset in bit within the address range specified by reg. - - minimum: 1 - description: - Size in bit within the address range specified by reg. + $ref: layouts/fixed-cell.yaml + deprecated: true =20 additionalProperties: true =20 --=20 2.34.1 From nobody Sun Feb 8 14:11:28 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B945EC77B62 for ; Mon, 27 Mar 2023 14:18:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232850AbjC0OSV (ORCPT ); Mon, 27 Mar 2023 10:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232526AbjC0OSG (ORCPT ); Mon, 27 Mar 2023 10:18:06 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B48C74EF4; Mon, 27 Mar 2023 07:16:21 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id j11so11629398lfg.13; Mon, 27 Mar 2023 07:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679926579; 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=xUI/boJJyBwexqi5pzYq09R7cmCZZDfn8166TkbccPA=; b=YvZ7Iw91yPR370hSqcrya7kzWkDlx0GxaLLswqfgY2kDoRjodyH8c5ht4TRfTnzGh8 rxXhBWE2D0R9rD55nyu6bPYVX+mf+UmYShlnvKzEm801re+x4thblmGWKsPK8ToE8ZhY uCvdWAN9YpWSI303VYcaZZlSQYEQjEkHFhxRIxCZQdjKf1hg4ouvncPeDDgDX/W+Mx6T Sm7/UciIprOe/XJMgwsXpkyBzhz/R0k0SsxXWWKHAOdVa992jSwh+rfFzOAiOMCl3aH4 KCbW34r+pZoZcQ6wHUTz1pXh42NpZ7hHX3xBetpJ/JCOP7ub3IF8Ap30//LnjxKBdupf 42zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679926579; 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=xUI/boJJyBwexqi5pzYq09R7cmCZZDfn8166TkbccPA=; b=JaK2m9wYG4ItQAOl8iL0PR3JJdq97jAddFIbnIi0I+I1p1Ezz964WehLQmyuPWSFfX 52qs557mX8Xs5M6AFcIC+ZYYE5i4ptffdnnQpfcUIAIjBXtBJ6UogGQ+UzUleX+xh4oA Osow07hXXd/3+MzPU4wYSPZ4tnckZCg3oDxhhGwKALnpNeQwNE1/awrEyjY6KhUZIbEl wEYxYNGBRyI1P6vI2NmHrDMbpRjPhVX3/QG0jY4lO0K3q8ONGWwS6SY/JMsLdM4YAHKJ VKNz3iBHkN42v3nIISYqYZNqDU1tkF9hwmrqcR+ERu6n2Q0jkUJmlDImalhmlMwSD0rb VU6g== X-Gm-Message-State: AAQBX9fqgjXpiOeSRGwsBfczI8DzpQPaoHTWBJ+Qqvq9QsNh9yUzxkwH qKkjwnyVPGv5qIY2DaYww/A= X-Google-Smtp-Source: AKy350boc4Hh/2cICnB+086LKmzzAAQjIgE+Fd/KSb+swqqx82dlqsj8bj2XzWr/jrizAWajbTmAow== X-Received: by 2002:a19:c202:0:b0:4db:2cdf:4c11 with SMTP id l2-20020a19c202000000b004db2cdf4c11mr3312945lfc.62.1679926579210; Mon, 27 Mar 2023 07:16:19 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004e977970721sm4444519lfl.219.2023.03.27.07.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 07:16:18 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla Cc: Greg Kroah-Hartman , Miquel Raynal , Michael Walle , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Rob Herring Subject: [PATCH V6 2/3] dt-bindings: nvmem: convert base example to use NVMEM fixed cells layout Date: Mon, 27 Mar 2023 16:16:10 +0200 Message-Id: <20230327141611.25131-3-zajec5@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327141611.25131-1-zajec5@gmail.com> References: <20230327141611.25131-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafa=C5=82 Mi=C5=82ecki With support for the "fixed-layout" binding it's possible and preferred now to define fixed NVMEM cells in the layout node. Do that for the example binding. Signed-off-by: Rafa=C5=82 Mi=C5=82ecki Reviewed-by: Rob Herring --- .../devicetree/bindings/nvmem/nvmem.yaml | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/nvmem/nvmem.yaml b/Documenta= tion/devicetree/bindings/nvmem/nvmem.yaml index b79f1bb795fb..980244100690 100644 --- a/Documentation/devicetree/bindings/nvmem/nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/nvmem.yaml @@ -68,24 +68,30 @@ examples: =20 /* ... */ =20 - /* Data cells */ - tsens_calibration: calib@404 { - reg =3D <0x404 0x10>; - }; - - tsens_calibration_bckp: calib_bckp@504 { - reg =3D <0x504 0x11>; - bits =3D <6 128>; - }; - - pvs_version: pvs-version@6 { - reg =3D <0x6 0x2>; - bits =3D <7 2>; - }; - - speed_bin: speed-bin@c{ - reg =3D <0xc 0x1>; - bits =3D <2 3>; + nvmem-layout { + compatible =3D "fixed-layout"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + /* Data cells */ + tsens_calibration: calib@404 { + reg =3D <0x404 0x10>; + }; + + tsens_calibration_bckp: calib_bckp@504 { + reg =3D <0x504 0x11>; + bits =3D <6 128>; + }; + + pvs_version: pvs-version@6 { + reg =3D <0x6 0x2>; + bits =3D <7 2>; + }; + + speed_bin: speed-bin@c{ + reg =3D <0xc 0x1>; + bits =3D <2 3>; + }; }; }; =20 --=20 2.34.1 From nobody Sun Feb 8 14:11:28 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4032C6FD1D for ; Mon, 27 Mar 2023 14:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233074AbjC0OSb (ORCPT ); Mon, 27 Mar 2023 10:18:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232654AbjC0OSH (ORCPT ); Mon, 27 Mar 2023 10:18:07 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93A8D4EF8; Mon, 27 Mar 2023 07:16:22 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id y20so11692049lfj.2; Mon, 27 Mar 2023 07:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679926581; 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=Yqch5jULqmWEWTHXX6KBVjnq6Ntet8zuoOYrwUTgPMo=; b=iCqbpfjj6D1JBfCpFPNBkQSPAcBZYhPKbCt0RxB7YdZxNLaFoqp9xbqChvpQjwUnLq ls5bH6NXww9DQc5NzTNJmcNQAHKRZLSdXTQyEioMetMlCfO44zQa9DTQrytKESz64n48 JZqD3TDGasafpqxVruF3SR8YO6p4aRzFmVqHZNq3cvdGBaUEMiMDrdRvM9dwR+d9R+if I5Lt03q6u2yw25MhJH4yBbduGDLgxO9FLvk1hKtl01YBctxzfdC/hzUSjreK3GJTuB5z bjPZiJYv/GkmQYlbqJvNXtm01B9ke+Eh9JewNZZIQuuYcUPKKajGOHluDW4vwbriWGME eKsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679926581; 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=Yqch5jULqmWEWTHXX6KBVjnq6Ntet8zuoOYrwUTgPMo=; b=MyVD7rC5mS/g8/VcEMs0SvLqmJ8ieAZVSoMdmxnkSpD4tnvz4ASx+ybO0SprwOZ+eL 8IPgP22He+7YB5vnkBOGPtEiDpo9DTTz9ssRf2GePhY6Jrcd+R/tiw9XrHEcut+x0tEz 4mfPNu3W6fpGey1MDR8qQFz/SYhIlMvLCqkLC9HiLDqKKQkH+i8HeTPaBg+vERo/GpKr ei8LgCKw0ffbF5LX+ARV1TrQE315O6HfFYJR2jgHjV+qnBfMqdwnCGFIch5xkp4x7+MO epeTbNqLowFuaAqos9B23A5fw9mHYw/hEWW6J8E1oqDYlWLatynNo4aEiaCff55HO/ZX bpBg== X-Gm-Message-State: AAQBX9dhe8rvbCf/g19F56LCqErMF2o7IkZughlZuV+7DNdngNSZmmsH eI6BZFm76hqZxijBhCPOawY= X-Google-Smtp-Source: AKy350b78cuprR1O5sE51wMcHwOQEtVA5k89dnr3VjwgN6PHM/VYjLse09v9ge6ZtU9BpvOX1ra0EA== X-Received: by 2002:ac2:5290:0:b0:4d8:6492:5689 with SMTP id q16-20020ac25290000000b004d864925689mr3290297lfm.31.1679926580982; Mon, 27 Mar 2023 07:16:20 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004e977970721sm4444519lfl.219.2023.03.27.07.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 07:16:20 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla Cc: Greg Kroah-Hartman , Miquel Raynal , Michael Walle , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V6 3/3] nvmem: core: add support for fixed cells *layout* Date: Mon, 27 Mar 2023 16:16:11 +0200 Message-Id: <20230327141611.25131-4-zajec5@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327141611.25131-1-zajec5@gmail.com> References: <20230327141611.25131-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafa=C5=82 Mi=C5=82ecki This adds support for the "fixed-layout" NVMEM layout binding. It allows defining NVMEM cells in a layout DT node named "nvmem-layout". While NVMEM subsystem supports layout drivers it has been discussed that "fixed-layout" may actually be supperted internally. It's because: 1. It's a very basic layout 2. It allows sharing code with legacy syntax parsing 3. It's safer for soc_device_match() due to -EPROBE_DEFER 4. This will make the syntax transition easier Signed-off-by: Rafa=C5=82 Mi=C5=82ecki Reviewed-by: Michael Walle --- V6: s/nvmem_add_cells_fixed/nvmem_add_cells_from_fixed_layout/ --- drivers/nvmem/core.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index a62973d010ff..b3d5a29477f9 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -696,7 +696,7 @@ static int nvmem_validate_keepouts(struct nvmem_device = *nvmem) return 0; } =20 -static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) +static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct devi= ce_node *np) { struct nvmem_layout *layout =3D nvmem->layout; struct device *dev =3D &nvmem->dev; @@ -704,7 +704,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device = *nvmem) const __be32 *addr; int len, ret; =20 - for_each_child_of_node(dev->of_node, child) { + for_each_child_of_node(np, child) { struct nvmem_cell_info info =3D {0}; =20 addr =3D of_get_property(child, "reg", &len); @@ -742,6 +742,28 @@ static int nvmem_add_cells_from_of(struct nvmem_device= *nvmem) return 0; } =20 +static int nvmem_add_cells_from_legacy_of(struct nvmem_device *nvmem) +{ + return nvmem_add_cells_from_dt(nvmem, nvmem->dev.of_node); +} + +static int nvmem_add_cells_from_fixed_layout(struct nvmem_device *nvmem) +{ + struct device_node *layout_np; + int err =3D 0; + + layout_np =3D of_nvmem_layout_get_container(nvmem); + if (!layout_np) + return 0; + + if (of_device_is_compatible(layout_np, "fixed-layout")) + err =3D nvmem_add_cells_from_dt(nvmem, layout_np); + + of_node_put(layout_np); + + return err; +} + int __nvmem_layout_register(struct nvmem_layout *layout, struct module *ow= ner) { layout->owner =3D owner; @@ -972,7 +994,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) if (rval) goto err_remove_cells; =20 - rval =3D nvmem_add_cells_from_of(nvmem); + rval =3D nvmem_add_cells_from_legacy_of(nvmem); if (rval) goto err_remove_cells; =20 @@ -982,6 +1004,10 @@ struct nvmem_device *nvmem_register(const struct nvme= m_config *config) if (rval) goto err_remove_cells; =20 + rval =3D nvmem_add_cells_from_fixed_layout(nvmem); + if (rval) + goto err_remove_cells; + rval =3D nvmem_add_cells_from_layout(nvmem); if (rval) goto err_remove_cells; --=20 2.34.1