From nobody Thu Apr 9 10:55:11 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 D3C93C433FE for ; Fri, 4 Nov 2022 16:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231639AbiKDQr3 (ORCPT ); Fri, 4 Nov 2022 12:47:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbiKDQrY (ORCPT ); Fri, 4 Nov 2022 12:47:24 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 836BA31EFC; Fri, 4 Nov 2022 09:47:22 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 6286A4000A; Fri, 4 Nov 2022 16:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9JEZ1c2lp6KpEcCyVREwYutRhrJJex3PSE0UiYvaYr4=; b=Em0KXUoGDMROIrOx9PdU72KhBktqNT1SHNCvhQpHbvfiBKU28pFDzVM9/QGxx8mLC8rEKf U6UTIs6mEVebIvcrw9Q66Sdgcd1u1RpCb+qJ4ChoHHZIafC27i39MPLzQkI7C/UKRwQwnn HNPyZ+N0XFrZFflHRXRqJh/ZUduxVtW9UHGyy/7JtY9NSsnAroyJFUoP/Awi/zfZEoRScO LhcAXvDu3epR5+Or5MJupp8Mdn0SyX2Ynolqno4cyt2sk/eZYwhcgUppPXv3HG2Kv6naqQ +1HXxb4q7IhEdZrvAmQBy+FOS7Bo34XKl8jZk9Q/maBxzLTl3t7HvZ1TB842LQ== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 01/17] dt-bindings: mtd: Clarify all partition subnodes Date: Fri, 4 Nov 2022 17:47:02 +0100 Message-Id: <20221104164718.1290859-2-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 Over time the various ways to define MTD partitions has evolved. Most of the controllers support several different bindings. Let's define all possible choices in one file and mark the legacy ones deprecated. This way, we can just reference this file and avoid dupplicating these definitions. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/mtd.yaml | 17 ++++++++++ .../bindings/mtd/partitions/partitions.yaml | 33 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/partit= ions.yaml diff --git a/Documentation/devicetree/bindings/mtd/mtd.yaml b/Documentation= /devicetree/bindings/mtd/mtd.yaml index 3498e485679b..a6b498bbdbb6 100644 --- a/Documentation/devicetree/bindings/mtd/mtd.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd.yaml @@ -21,7 +21,24 @@ properties: based name) in order to ease flash device identification and/or describe what they are used for. =20 + '#address-cells': + deprecated: true + + '#size-cells': + deprecated: true + + partitions: + $ref: /schemas/mtd/partitions/partitions.yaml + patternProperties: + "@[0-9a-f]+$": + $ref: partitions/partition.yaml + deprecated: true + + "^partition@[0-9a-f]+": + $ref: partitions/partition.yaml + deprecated: true + "^otp(-[0-9]+)?$": type: object $ref: ../nvmem/nvmem.yaml# diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.ya= ml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml new file mode 100644 index 000000000000..ff65795de285 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/partitions.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Partitions + +description: | + This binding is generic and describes the content of the partitions cont= ainer + node. All partition parsers must be referenced here. + +maintainers: + - Miquel Raynal + +properties: + compatible: true + + '#address-cells': + enum: [1, 2] + + '#size-cells': + enum: [1, 2] + +patternProperties: + "partition(-.+|@[0-9a-f]+)": + $ref: partition.yaml + +required: + - compatible + +# Temporary value, should be set to false when constraining the parsers li= st +additionalProperties: true --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 06166C4332F for ; Fri, 4 Nov 2022 16:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232007AbiKDQrv (ORCPT ); Fri, 4 Nov 2022 12:47:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231535AbiKDQr3 (ORCPT ); Fri, 4 Nov 2022 12:47:29 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCA3B31F88; Fri, 4 Nov 2022 09:47:25 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 68F2C4000C; Fri, 4 Nov 2022 16:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9GgQ6Sk6Ebll+26wyuvSyP9c28FQcBgUw85oCY9S6Ho=; b=nqyaBQwsiE7Sara4ljYb3o7J9WZa6MxhGJrJxr7kUuIPcEjxa/dk6zUl1CBXVXHZnt1iJH z+/t4yTAcYINIjiHpInQl+7ThCcVR7/NaKb844OOxVY+2Qs8rxOx41Owfzf+kkBXKSoNm/ 23jL7n1epPMq+jHN0rh0BbLe+g3FPd6UOCP3NG7kDaoZmVTlGX15uGCj6LC2CDLnFoMb8Z cQxzUfb1ZDe9STsASlvNF2NTlhoiVsWTtmG37XpUOm2YkFlHWNhEN9ntxeF0n6vx8zRJP+ tgqimVejd9KoveCtNdB3rNEvfEDEwNX1/p1V5vbdLaD6CbXwhl5kEn+46Y8oQw== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 02/17] dt-bindings: mtd: Remove useless file about partitions Date: Fri, 4 Nov 2022 17:47:03 +0100 Message-Id: <20221104164718.1290859-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 There is already a real partitions.yaml file, so assuming everybody knows hot to read yaml schema now, this text file is no longer needed, so drop it. Depending on the situation, the lines referring to this file are either dropped or edited to point to mtd.yaml which includes partition{,s}.yaml. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/atmel-nand.txt | 6 ++-- .../devicetree/bindings/mtd/ingenic,nand.yaml | 1 - .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 2 +- .../devicetree/bindings/mtd/lpc32xx-slc.txt | 2 +- .../devicetree/bindings/mtd/mtk-nand.txt | 2 +- .../devicetree/bindings/mtd/partition.txt | 33 ------------------- drivers/mtd/parsers/Kconfig | 2 +- 7 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mtd/partition.txt diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documen= tation/devicetree/bindings/mtd/atmel-nand.txt index 3aa297c97ab6..50645828ac20 100644 --- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt +++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt @@ -45,10 +45,8 @@ Optional properties: - atmel,rb: an integer identifying the native Ready/Busy pin. Only meaning= ful on sama5 SoCs. =20 -All generic properties described in -Documentation/devicetree/bindings/mtd/{common,nand}.txt also apply to the = NAND -device node, and NAND partitions should be defined under the NAND node as -described in Documentation/devicetree/bindings/mtd/partition.txt. +All generic properties are described in the generic yaml files under +Documentation/devicetree/bindings/mtd/. =20 * ECC engine (PMECC) bindings: =20 diff --git a/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml b/Docu= mentation/devicetree/bindings/mtd/ingenic,nand.yaml index 8c272c842bfd..87b2944d0d1b 100644 --- a/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml +++ b/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml @@ -34,7 +34,6 @@ properties: type: object description: Node containing description of fixed partitions. - See Documentation/devicetree/bindings/mtd/partition.txt =20 patternProperties: "^nand@[a-f0-9]$": diff --git a/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt b/Docume= ntation/devicetree/bindings/mtd/lpc32xx-mlc.txt index 6d60bc3063f5..64c06aa05ac7 100644 --- a/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt +++ b/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt @@ -19,7 +19,7 @@ accuracy:) - nxp,wr_low: WR_LOW =20 Optional subnodes: -- Partitions, see Documentation/devicetree/bindings/mtd/partition.txt +- Partitions, see Documentation/devicetree/bindings/mtd/mtd.yaml =20 Example: =20 diff --git a/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt b/Docume= ntation/devicetree/bindings/mtd/lpc32xx-slc.txt index d94edc0fc554..39f17630a301 100644 --- a/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt +++ b/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt @@ -20,7 +20,7 @@ clock speed:) - nxp,rsetup: Read setup time (R_SETUP) =20 Optional subnodes: -- Partitions, see Documentation/devicetree/bindings/mtd/partition.txt +- Partitions, see Documentation/devicetree/bindings/mtd/mtd.yaml =20 Example: =20 diff --git a/Documentation/devicetree/bindings/mtd/mtk-nand.txt b/Documenta= tion/devicetree/bindings/mtd/mtk-nand.txt index 4d3ec5e4ff8a..839ea2f93d04 100644 --- a/Documentation/devicetree/bindings/mtd/mtk-nand.txt +++ b/Documentation/devicetree/bindings/mtd/mtk-nand.txt @@ -131,7 +131,7 @@ Example: }; =20 NAND chip optional subnodes: -- Partitions, see Documentation/devicetree/bindings/mtd/partition.txt +- Partitions, see Documentation/devicetree/bindings/mtd/mtd.yaml =20 Example: nand@0 { diff --git a/Documentation/devicetree/bindings/mtd/partition.txt b/Document= ation/devicetree/bindings/mtd/partition.txt deleted file mode 100644 index ead90e8274d6..000000000000 --- a/Documentation/devicetree/bindings/mtd/partition.txt +++ /dev/null @@ -1,33 +0,0 @@ -Flash partitions in device tree -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D - -Flash devices can be partitioned into one or more functional ranges (e.g. = "boot -code", "nvram", "kernel"). - -Different devices may be partitioned in a different ways. Some may use a f= ixed -flash layout set at production time. Some may use on-flash table that desc= ribes -the geometry and naming/purpose of each functional region. It is also poss= ible -to see these methods mixed. - -To assist system software in locating partitions, we allow describing which -method is used for a given flash device. To describe the method there shou= ld be -a subnode of the flash device that is named 'partitions'. It must have a -'compatible' property, which is used to identify the method to use. - -When a single partition is represented with a DT node (it depends on a used -format) it may also be described using above rules ('compatible' and optio= nally -some extra properties / subnodes). It allows describing more complex, -hierarchical (multi-level) layouts and should be used if there is some -significant relation between partitions or some partition internally uses -another partitioning method. - -Available bindings are listed in the "partitions" subdirectory. - - -Deprecated: partitions defined in flash node -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -For backwards compatibility partitions as direct subnodes of the flash dev= ice are -supported. This use is discouraged. -NOTE: also for backwards compatibility, direct subnodes that have a compat= ible -string are not considered partitions, as they may be used for other bindin= gs. diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index aaa06050c9bc..b53b8bc7c9e6 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -75,7 +75,7 @@ config MTD_OF_PARTS This provides a open firmware device tree partition parser which derives the partition map from the children of the flash memory node, as described in - Documentation/devicetree/bindings/mtd/partition.txt. + Documentation/devicetree/bindings/mtd/mtd.yaml. =20 config MTD_OF_PARTS_BCM4908 bool "BCM4908 partitioning support" --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 CEF62C433FE for ; Fri, 4 Nov 2022 16:47:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231670AbiKDQre (ORCPT ); Fri, 4 Nov 2022 12:47:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231238AbiKDQrZ (ORCPT ); Fri, 4 Nov 2022 12:47:25 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB9CE31EF9; Fri, 4 Nov 2022 09:47:24 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 6119740007; Fri, 4 Nov 2022 16:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Y3Ilf0k1Zb565CDODTPYfsRYtki95YJmPfK8ZRRt10=; b=iKTxZ6dREfCsN0mTYQ64N+B6C0rk1kphN36VYOjBtaLCmQfd81/rL3BnpA6UbUMjSdR3LS qVnDtFCdvpNxoDuP90TZLLNs0QAoZFYBDduK2DSQHeAzYpgarAYrPA9E84J3LRAVty10+Y ixmeGdb15jzNAYo/ae2stTiyP5dmDMgqGp4O+y3oNnJpXceq5YDkgoI4yC8U8JoP5vQPC7 GueIQZag0QZROTmy50/IWCQ/wtQg2MjEC/0TFm2TRgoBtljxvNPUMJiwV2HRKe6twMvOTU PynrYDbSnQoOSRoDaoRKer/3VbVlWWqdNIWLEln6rg2oHKvM79l/QYe0xxli7w== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal , Rob Herring Subject: [PATCH v2 03/17] dt-bindings: mtd: nand-chip: Reference mtd.yaml Date: Fri, 4 Nov 2022 17:47:04 +0100 Message-Id: <20221104164718.1290859-4-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 A NAND chip is an MTD device. mtd.yaml already defines many useful and relevant properties, let's reference this file here to get access to these additional property definitions. Signed-off-by: Miquel Raynal Acked-by: Rob Herring Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/nand-chip.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/nand-chip.yaml b/Documen= tation/devicetree/bindings/mtd/nand-chip.yaml index 97ac3a3fbb52..8d5d2d3ef56b 100644 --- a/Documentation/devicetree/bindings/mtd/nand-chip.yaml +++ b/Documentation/devicetree/bindings/mtd/nand-chip.yaml @@ -9,6 +9,9 @@ title: NAND Chip and NAND Controller Generic Binding maintainers: - Miquel Raynal =20 +allOf: + - $ref: "mtd.yaml#" + description: | This file covers the generic description of a NAND chip. It implies that= the bus interface should not be taken into account: both raw NAND devices and --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 ECDAAC4332F for ; Fri, 4 Nov 2022 16:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231796AbiKDQrl (ORCPT ); Fri, 4 Nov 2022 12:47:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231476AbiKDQr2 (ORCPT ); Fri, 4 Nov 2022 12:47:28 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9E3131F8C; Fri, 4 Nov 2022 09:47:25 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 77FA74000D; Fri, 4 Nov 2022 16:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TiQPntzC2ir2r9t3qv3kzKf1NvJ5V3BTdHExODnectk=; b=G/ygxGmxnKtQ3TngXx5aoy/hQTBclVESME1UOBdg1JJhAPSb+yPYEKraCOXI+VnAM7axic z4kfKTUpF0n3ccGXD2C7whJsL77DyarR0EPLUxybaj3HifBpxIZbbowO2zdcBnrpzhCoTc XeKvqV26JRME2feyaNzskFRVSiv/lul0FRmoYJrp9G5D+qMhkiUhgEY2NAgqlQ+P6HktNW KeieFzzvrYVHBCIzQZYHCveZvGoH12Qk3Vt1Hk2y/pUa/tFKHU1Q1QArMDz5XmdycgsOsW enjYhuSdElXEvh/nOAVP8Tw1gpaS7UBclrnVdfSNXA0/ZTOtpcJe20ThcXSjDQ== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 04/17] dt-bindings: mtd: nand: Drop common properties already defined in generic files Date: Fri, 4 Nov 2022 17:47:05 +0100 Message-Id: <20221104164718.1290859-5-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 generic files, so let's drop these properties from the individual NAND controller bindings when no additional information is provided rather than the possible presence of the property. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 9 +-------- .../bindings/mtd/arasan,nand-controller.yaml | 5 +---- .../devicetree/bindings/mtd/intel,lgm-ebunand.yaml | 10 +--------- Documentation/devicetree/bindings/mtd/qcom,nandc.yaml | 3 --- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand= .yaml b/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml index 4741864da48e..65521924ee1c 100644 --- a/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml @@ -14,9 +14,6 @@ maintainers: - Maxime Ripard =20 properties: - "#address-cells": true - "#size-cells": true - compatible: enum: - allwinner,sun4i-a10-nand @@ -49,11 +46,7 @@ properties: dma-names: const: rxtx =20 - pinctrl-names: true - patternProperties: - "^pinctrl-[0-9]+$": true - "^nand@[a-f0-9]+$": type: object properties: @@ -91,6 +84,6 @@ required: - clocks - clock-names =20 -additionalProperties: false +unevaluatedProperties: false =20 ... diff --git a/Documentation/devicetree/bindings/mtd/arasan,nand-controller.y= aml b/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml index f013fb976d95..d028269cdbaa 100644 --- a/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml +++ b/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml @@ -35,9 +35,6 @@ properties: interrupts: maxItems: 1 =20 - "#address-cells": true - "#size-cells": true - required: - compatible - reg @@ -45,7 +42,7 @@ required: - clock-names - interrupts =20 -additionalProperties: true +unevaluatedProperties: true =20 examples: - | diff --git a/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml b= /Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml index 741c66ee06c3..7c83a328845e 100644 --- a/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml +++ b/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml @@ -39,12 +39,6 @@ properties: - const: tx - const: rx =20 - "#address-cells": - const: 1 - - "#size-cells": - const: 0 - patternProperties: "^nand@[a-f0-9]+$": type: object @@ -67,10 +61,8 @@ required: - clocks - dmas - dma-names - - "#address-cells" - - "#size-cells" =20 -additionalProperties: false +unevaluatedProperties: false =20 examples: - | diff --git a/Documentation/devicetree/bindings/mtd/qcom,nandc.yaml b/Docume= ntation/devicetree/bindings/mtd/qcom,nandc.yaml index 482a2c068740..3cc90c64e974 100644 --- a/Documentation/devicetree/bindings/mtd/qcom,nandc.yaml +++ b/Documentation/devicetree/bindings/mtd/qcom,nandc.yaml @@ -31,9 +31,6 @@ properties: - const: core - const: aon =20 - "#address-cells": true - "#size-cells": true - patternProperties: "^nand@[a-f0-9]$": type: object --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 99A6CC4332F for ; Fri, 4 Nov 2022 16:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232038AbiKDQsB (ORCPT ); Fri, 4 Nov 2022 12:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbiKDQr3 (ORCPT ); Fri, 4 Nov 2022 12:47:29 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3301731EFC; Fri, 4 Nov 2022 09:47:27 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 8B9744000E; Fri, 4 Nov 2022 16:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1BVXfpUDpuO14vpkhrGj4WhajxKP64/OBHEAjC1gJJU=; b=YDzbuVof2BvQCL5+tC0MmGS8rNod+85O+cSBK1eT7Ru8ktT/MCZQp4ix2sFrRCUezRZWdA G2QIlNNJoydsR8NferXcXIdgYGuDeAWg9c7FVm+GVH/H5oBqoNKEUtthuyZNqw0MCz01q7 YQ5SLlsrUG3eI8GNSEdt4CuPaG9EaJCZ9cOrvYrEo2Er72D9s5JmPxP8Ok8u7B+7Zh2brS SqatFHtjnOm5ZzP2VdlTXZ3pRAXO6zKeXsUhO7vJ4j6JwXVjLtV/+z6Pknn/+6kx46cAZF Hewwv/KkOrWTbhDdtxcOytvFtUC1LazYonxqx79RZNotMDU3RB0bYl+6xoo3gg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 05/17] dt-bindings: mtd: nand: Standardize the child node name Date: Fri, 4 Nov 2022 17:47:06 +0100 Message-Id: <20221104164718.1290859-6-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 In almost all the schema mentioning a NAND chip child node, the name of the subnode contains a single index number. In practice there are currently no controller supporting more than 8 cs so even the [a-f] numbers are not needed. But let's be safe and limit the number of touched files by just allow a single number everywhere, so in practice up to 16 CS at most. This value can anyway be limited in each schema. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand= .yaml b/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml index 65521924ee1c..465aa69f0f10 100644 --- a/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml @@ -47,7 +47,7 @@ properties: const: rxtx =20 patternProperties: - "^nand@[a-f0-9]+$": + "^nand@[a-f0-9]$": type: object properties: reg: diff --git a/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml b= /Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml index 7c83a328845e..d455b75a0b0b 100644 --- a/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml +++ b/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml @@ -40,7 +40,7 @@ properties: - const: rx =20 patternProperties: - "^nand@[a-f0-9]+$": + "^nand@[a-f0-9]$": type: object properties: reg: --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 6381FC4332F for ; Fri, 4 Nov 2022 16:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231926AbiKDQrz (ORCPT ); Fri, 4 Nov 2022 12:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231238AbiKDQrf (ORCPT ); Fri, 4 Nov 2022 12:47:35 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F7A040442; Fri, 4 Nov 2022 09:47:28 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id CC8D840013; Fri, 4 Nov 2022 16:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=abWxBYqdkWoQQQ3GX9Ts6R6Hk4Vd1Cu/4zxI2EIxg38=; b=Mnu1nATjTqPwq1hRv6A1JF5exhMNr+6cwqEEau+Z4GMy5leCp8uBPVSTRgOhjEOq7YF3iy L4/RtjaX7s6M2CjuDAG0W4U2x1+cAUwPObARXyXP9LDIHKF4hoxW9fquRa5CLyFmxLCfnD r9mzSqyQSBBSWPgrUjRE7jDiaRTqHNhWVo7uJ3ZazBNXH2sY531Y5s8gvt0LmDLzYQSqgU +GNWnTR2TV6cVROa/PdiExz9IAKOqfx2Kzmij7FByKaYI4tUHWqXfa26UYlVGRtnpWiC9x A+KlQORXPG8I3mKUdAPVbWpeNpqsbNNXgqSCQ+5zR5fhVsEsyWMEzdu6QkRvVQ== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal , Rob Herring Subject: [PATCH v2 06/17] dt-bindings: mtd: ingenic: Mark partitions in the controller node as deprecated Date: Fri, 4 Nov 2022 17:47:07 +0100 Message-Id: <20221104164718.1290859-7-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 Defining partitions as subnodes of the controller has been deprecated long time ago, but unlike having partitions within the controller node, having an enveloppe named "partitions" (which is not itself within a chip subnode) is not that common, so keep this deprecated definition in this file. Signed-off-by: Miquel Raynal Acked-by: Rob Herring Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/ingenic,nand.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml b/Docu= mentation/devicetree/bindings/mtd/ingenic,nand.yaml index 87b2944d0d1b..90dbc5eba1e7 100644 --- a/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml +++ b/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml @@ -32,6 +32,7 @@ properties: =20 partitions: type: object + deprecated: true description: Node containing description of fixed partitions. =20 --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 53C07C4332F for ; Fri, 4 Nov 2022 16:48:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbiKDQsF (ORCPT ); Fri, 4 Nov 2022 12:48:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231680AbiKDQrf (ORCPT ); Fri, 4 Nov 2022 12:47:35 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AB8840445; Fri, 4 Nov 2022 09:47:29 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id DA7B140010; Fri, 4 Nov 2022 16:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uhHL581pVZ78rpGpusp3WI56Gx3E7sF7B6MwrnAS96k=; b=jAD8aravNoAwXsGAU97Rgz+cSv3XEdMGLJolk0UC8/9ErrXVaLMWU+wmG3uBBwH6r/4s2u 31ioeY8+B15tmaRyVcsv5CvXQCCYNj8FRN5CUpZf6jqJAwb+MO06NTuDr0SXM8kKR4ki+5 t/Gy64wq6WPVEWeLBaqpp4tOuUn2+/1Ukg+Sb21voBtE8hQ0pD+kJCVTS82/4+Ds7xId1E jtaWTjOv9AdVZAXeZy+HDTKFIklFqBvUiDAGnFyns9474rfnKOfxZGTbn7WWd4sT4aDg+z MzDIHE8V9qWahZO0ZMbbU71vrLlYJoT/gsceTAmNQUB8Amf34RX6ep7QYgOPOg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 07/17] dt-bindings: mtd: onenand: Mention the expected node name Date: Fri, 4 Nov 2022 17:47:08 +0100 Message-Id: <20221104164718.1290859-8-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 The chip node name in this driver is expected to be different and should be prefixed with onenand instead of the regular "flash" string, so mention it. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml b/D= ocumentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml index a953f7397c40..8a79ad300216 100644 --- a/Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml +++ b/Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml @@ -15,6 +15,9 @@ description: as child nodes of the GPMC controller. =20 properties: + $nodename: + pattern: "^onenand@[0-9],[0,9]$" + compatible: const: ti,omap2-onenand =20 --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 36BAAC4332F for ; Fri, 4 Nov 2022 16:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232124AbiKDQsq (ORCPT ); Fri, 4 Nov 2022 12:48:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231719AbiKDQrf (ORCPT ); Fri, 4 Nov 2022 12:47:35 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16D3E40447; Fri, 4 Nov 2022 09:47:29 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id E073440015; Fri, 4 Nov 2022 16:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QRDFGN+zRO7AC+X4pkKNuDHyPBAeUFzjW6kshWON1O0=; b=j60Y7aIsofHslJoIacsEQGtjo0nM1/27uO6nXcszwdWCIxxEJqr6vUscDjY6J5i63BFMbp 3TYA5sCjL1oTMDdBzsfPAUtD2+p9NT7B3NI1oIt5d3OAb4lkshrm9GkXERRJ6zZ/Zb0aVd 1v5PRs78PMysm+O8OacpszphDDASGuBDj4QdkZK8SCVFest8Chw1r7tkFTJfz3/0kTf3Tp D9bpQJ7bddiYBX7GnOyyOSn2eGaDGbW/0izcnJfmgFsQAPVYqaf1bWJ49yO75cfCY9Udrr H585MAQI250G7MPzZaQfut3GwVsMIYOYQcWENUtZyqRWJGRetiExdP/8PBEMwg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 08/17] dt-bindings: mtd: sunxi-nand: Add an example to validate the bindings Date: Fri, 4 Nov 2022 17:47:09 +0100 Message-Id: <20221104164718.1290859-9-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 Copy-paste an existing DT node to ensure the dt_binding_check target would catch any unforeseen difference. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../mtd/allwinner,sun4i-a10-nand.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand= .yaml b/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml index 465aa69f0f10..e7ec0c59bca6 100644 --- a/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml @@ -86,4 +86,27 @@ required: =20 unevaluatedProperties: false =20 +examples: + - | + #include + #include + #include + #include + + nand-controller@1c03000 { + compatible =3D "allwinner,sun8i-a23-nand-controller"; + reg =3D <0x01c03000 0x1000>; + interrupts =3D ; + clocks =3D <&ccu CLK_BUS_NAND>, <&ccu CLK_NAND>; + clock-names =3D "ahb", "mod"; + resets =3D <&ccu RST_BUS_NAND>; + reset-names =3D "ahb"; + dmas =3D <&dma 5>; + dma-names =3D "rxtx"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&nand_pins &nand_cs0_pin &nand_rb0_pin>; + #address-cells =3D <1>; + #size-cells =3D <0>; + }; + ... --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 27EC4C4332F for ; Fri, 4 Nov 2022 16:48:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232103AbiKDQsl (ORCPT ); Fri, 4 Nov 2022 12:48:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231791AbiKDQrk (ORCPT ); Fri, 4 Nov 2022 12:47:40 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B340A40444; Fri, 4 Nov 2022 09:47:31 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 0233A4000F; Fri, 4 Nov 2022 16:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IMd5yQHc0mg7inpTTSKlKhmW8IystLlC3mwO9N5nbf0=; b=FNDTfcPTtyJh2vWCDfbV0YsXKparDkVC09tH0f2e9VUX64GkFKoIlb3KcmAr8i4tiUKQzx FfoNQBiPQ0K/qhH6TtXB/c0eF6iHAPB7SljAQwnhn9hbp1xfJmMuZOEKt2ZKmyz/viud38 TPi+mZ3Psr82zqW/raLhsFY7LudPor9khshmZNfI3f8+0t8TYUs50iaYSFmx9r566JZB+E guHkTIi3qTaeFtNUGY42O6OPLE+1gcVVfqhnLqrgK4UObxHYqIW5w/ffb0Fp1Jy5emVlwT K3MgEdI+Ma43O4+O/k9m3iKdJKK6T2CDfL82yLnAcNcXTNHjkQaWWEDubWBHpg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal , Rob Herring Subject: [PATCH v2 09/17] dt-bindings: mtd: spi-nor: Drop common properties Date: Fri, 4 Nov 2022 17:47:10 +0100 Message-Id: <20221104164718.1290859-10-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 When redefining common properties does not bring any additional information, just drop them from the SPI-NOR bindings because these properties already are definied in mtd.yaml. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml b/Doc= umentation/devicetree/bindings/mtd/jedec,spi-nor.yaml index 7149784a36ac..6cc491083650 100644 --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml @@ -70,20 +70,6 @@ properties: be used on such systems, to denote the absence of a reliable reset mechanism. =20 - partitions: - type: object - - '#address-cells': true - '#size-cells': true - -patternProperties: - # Note: use 'partitions' node for new users - '^partition@': - type: object - - "^otp(-[0-9]+)?$": - type: object - unevaluatedProperties: false =20 examples: --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 CD594C4332F for ; Fri, 4 Nov 2022 16:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230089AbiKDQsZ (ORCPT ); Fri, 4 Nov 2022 12:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231864AbiKDQrm (ORCPT ); Fri, 4 Nov 2022 12:47:42 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E62634045D; Fri, 4 Nov 2022 09:47:32 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 9DC7440004; Fri, 4 Nov 2022 16:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tjavzH+cgvyVn10sIb3TajzzynkuJ4IjBmZ/bGLtnUI=; b=OEYTCO5+4f36WFPpc931MekHiJo1gUYCq+KWG53vJbjkgQGYJG/FLJU2nn6v3KueuYtvP5 Xu70MwSLsenRIdoI+yZQvNwdAjNoo0PY5RuzBR5fet+XGITeAYsvMMlZS89wmO03SZDJuV iQC0EoBDG+Q2XEt5I6QpneA22c/26gihS0xO+cceDd+QJtB1I+4TiU8ZZjEBNYCstJo2HH X9YpT1MTaiC4QV2ZvbKhXAIiAXn00+vZtVBX5UIxyl7FjabYesVRvyJOMwTGWgfPZbtPQw oBfGZS/czSyRKVeWVNEvbAQXQSN5zfvl9LFUCb4zHVphaLIOSsXI0hXLmtMrjw== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 10/17] dt-bindings: mtd: physmap: Reuse the generic definitions Date: Fri, 4 Nov 2022 17:47:11 +0100 Message-Id: <20221104164718.1290859-11-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 The memory mapped MTD devices also share a lot with all the other MTD devices, so let's share the properties by referencing mtd.yaml. We can then drop mentioning the properties, to the cost of mentioning the possible "sram" node name prefix. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/mtd-physmap.yaml | 7 +++---- Documentation/devicetree/bindings/mtd/mtd.yaml | 2 +- Documentation/devicetree/bindings/mtd/nand-controller.yaml | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml b/Docum= entation/devicetree/bindings/mtd/mtd-physmap.yaml index 82eb4e0f453b..5df94953c34e 100644 --- a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml @@ -13,6 +13,9 @@ description: | Flash chips (Memory Technology Devices) are often used for solid state file systems on embedded devices. =20 +allOf: + - $ref: "mtd.yaml#" + properties: compatible: oneOf: @@ -121,10 +124,6 @@ properties: big-endian: true little-endian: true =20 -patternProperties: - '@[0-9a-f]+$': - $ref: partitions/partition.yaml - required: - compatible - reg diff --git a/Documentation/devicetree/bindings/mtd/mtd.yaml b/Documentation= /devicetree/bindings/mtd/mtd.yaml index a6b498bbdbb6..2fbd0a2ff548 100644 --- a/Documentation/devicetree/bindings/mtd/mtd.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd.yaml @@ -12,7 +12,7 @@ maintainers: =20 properties: $nodename: - pattern: "^flash(@.*)?$" + pattern: "^(flash|.*sram)(@.*)?$" =20 label: description: diff --git a/Documentation/devicetree/bindings/mtd/nand-controller.yaml b/D= ocumentation/devicetree/bindings/mtd/nand-controller.yaml index 359a015d4e5a..3f2a1480e1eb 100644 --- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml +++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml @@ -51,7 +51,6 @@ properties: =20 patternProperties: "^nand@[a-f0-9]$": - type: object $ref: "nand-chip.yaml#" =20 properties: --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 3AF83C433FE for ; Fri, 4 Nov 2022 16:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232076AbiKDQsR (ORCPT ); Fri, 4 Nov 2022 12:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231522AbiKDQrm (ORCPT ); Fri, 4 Nov 2022 12:47:42 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9F1640463; Fri, 4 Nov 2022 09:47:33 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 8FCE040012; Fri, 4 Nov 2022 16:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p71j8d2SmYLQ6c2itM9CC/tES1wHjKai9EtqL7pWA8U=; b=jN7KeFvPpX1StScCgwr0C9ycidffQZWu3+18tklZTArlCIdwx6LtVCF7SmU0tqs97QYjLC FUw+0NnuWmfkx+74JbXv5caNYvwJHz+8P1IGuuNgDhoX2ZvIxYkjCS3NFSjJB2A5T//ZtI AI1RB7TpdIsRaOnWthXrcihCqlYZvGuK+KV5mFSHZDkThhOLCDKN+tIUFZBS1WB0TwRRPL eoxdGE5PPt5C3/+TxCawJYUtGI6a7EltTFeNIaCVXtvcnspw8lg/ZFlgnMydu2qjxv9fgl dcUTwJCMT3+4vdF7zZ/3PX1A81xPMwYee/c+xyrBfmXRBh4/VHp2sGIwssRwTw== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 11/17] dt-bindings: mtd: partitions: Constrain the list of parsers Date: Fri, 4 Nov 2022 17:47:12 +0100 Message-Id: <20221104164718.1290859-12-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 Parser compatibles cannot be used anywhere, and the list is limited. In order to constrain this list, enumerate them all under the top "partitions" subnode. New parsers will have to add their own compatible here as well. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/mtd.yaml | 3 +++ .../mtd/partitions/arm,arm-firmware-suite.yaml | 2 ++ .../mtd/partitions/brcm,bcm4908-partitions.yaml | 2 ++ .../mtd/partitions/brcm,bcm947xx-cfe-partitions.yaml | 2 ++ .../mtd/partitions/linksys,ns-partitions.yaml | 2 ++ .../bindings/mtd/partitions/partitions.yaml | 12 ++++++++++-- .../bindings/mtd/partitions/qcom,smem-part.yaml | 2 ++ .../bindings/mtd/partitions/redboot-fis.yaml | 6 ++++++ 8 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/mtd.yaml b/Documentation= /devicetree/bindings/mtd/mtd.yaml index 2fbd0a2ff548..2494ec2d80e3 100644 --- a/Documentation/devicetree/bindings/mtd/mtd.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd.yaml @@ -30,6 +30,9 @@ properties: partitions: $ref: /schemas/mtd/partitions/partitions.yaml =20 + required: + - compatible + patternProperties: "@[0-9a-f]+$": $ref: partitions/partition.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmw= are-suite.yaml b/Documentation/devicetree/bindings/mtd/partitions/arm,arm-f= irmware-suite.yaml index 76c88027b6d2..97618847ee35 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-sui= te.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-sui= te.yaml @@ -9,6 +9,8 @@ title: ARM Firmware Suite (AFS) Partitions maintainers: - Linus Walleij =20 +select: false + description: | The ARM Firmware Suite is a flash partitioning system found on the ARM reference designs: Integrator AP, Integrator CP, Versatile AB, diff --git a/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm4908-= partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm= 4908-partitions.yaml index 7b113e5e3421..5bbb1c01ddee 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm4908-partiti= ons.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm4908-partiti= ons.yaml @@ -17,6 +17,8 @@ description: | maintainers: - Rafa=C5=82 Mi=C5=82ecki =20 +select: false + properties: compatible: const: brcm,bcm4908-partitions diff --git a/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx= -cfe-partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/brc= m,bcm947xx-cfe-partitions.yaml index 3484e06d6bcb..939e7b50db22 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx-cfe-pa= rtitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx-cfe-pa= rtitions.yaml @@ -35,6 +35,8 @@ description: | maintainers: - Rafa=C5=82 Mi=C5=82ecki =20 +select: false + properties: compatible: const: brcm,bcm947xx-cfe-partitions diff --git a/Documentation/devicetree/bindings/mtd/partitions/linksys,ns-pa= rtitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/linksys,ns= -partitions.yaml index 99249cdfbfb3..213858f60375 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/linksys,ns-partition= s.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/linksys,ns-partition= s.yaml @@ -18,6 +18,8 @@ description: | maintainers: - Rafa=C5=82 Mi=C5=82ecki =20 +select: false + properties: compatible: const: linksys,ns-partitions diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.ya= ml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml index ff65795de285..9aca4e6c6047 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -13,6 +13,15 @@ description: | maintainers: - Miquel Raynal =20 +oneOf: + - $ref: arm,arm-firmware-suite.yaml + - $ref: brcm,bcm4908-partitions.yaml + - $ref: brcm,bcm947xx-cfe-partitions.yaml + - $ref: fixed-partitions.yaml + - $ref: linksys,ns-partitions.yaml + - $ref: qcom,smem-part.yaml + - $ref: redboot-fis.yaml + properties: compatible: true =20 @@ -29,5 +38,4 @@ patternProperties: required: - compatible =20 -# Temporary value, should be set to false when constraining the parsers li= st -additionalProperties: true +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-par= t.yaml b/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.ya= ml index dc07909af023..805eabece7c8 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml @@ -15,6 +15,8 @@ description: | varies between partition table revisions. V3 supports maximum 16 partiti= ons and V4 supports 48 partitions. =20 +select: false + properties: compatible: const: qcom,smem-part diff --git a/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.y= aml b/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml index fee8d81b5276..ba7445cd69e8 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml @@ -16,6 +16,8 @@ description: The FLASH Image System (FIS) directory is a = flash description maintainers: - Linus Walleij =20 +select: false + properties: compatible: const: redboot-fis @@ -26,6 +28,10 @@ properties: device. On a flash memory with 32KB eraseblocks, 0 means the first eraseblock at 0x00000000, 1 means the second eraseblock at 0x0000800= 0 and so on. =20 + '#address-cells': false + + '#size-cells': false + required: - compatible - fis-index-block --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 A8CD1C433FE for ; Fri, 4 Nov 2022 16:48:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232088AbiKDQsd (ORCPT ); Fri, 4 Nov 2022 12:48:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231888AbiKDQro (ORCPT ); Fri, 4 Nov 2022 12:47:44 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE88C40468; Fri, 4 Nov 2022 09:47:34 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 8EF324000A; Fri, 4 Nov 2022 16:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Az+vA24nx4uvmv1Sczda31bkwb6yQkjFSBWEcaTheT0=; b=ChQj65BOvZTCxBNYdAezFTY653MJ7ia/ynKE/exoiU1+ta/nj9vOU47PweC4brOYyobd2Q QSL7o/J6vNEgkyS97jmPqVaPZTsCdf3HJ7Enm/QCbX27+wTUBvCMdiymxCyHlWd3sAUYJC 07ZSrzuLaNJpX7hMftY2WlwzroIVXx5RFnlPiW/0xdM+Qu4o2i0bYBPg+8eBTm782NLtHc 13Atqdm9kmT+kRCHWJLlLhcAFHDS50TdCNF4crWB39lnoLc1yf3pXOYlNvXvBU7occfnN/ Exbgr+IN8mhycDdx0mKf6zW4KUHpgxQoTmo67SCNY6QS7xG+z9urJ4o1kNdKww== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 12/17] dt-bindings: mtd: partitions: Change qcom,smem-part partition type Date: Fri, 4 Nov 2022 17:47:13 +0100 Message-Id: <20221104164718.1290859-13-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 As described in dd638202dfb6 ("dt-bindings: mtd: partitions: add additional example for qcom,smem-part"), the aim of documenting the subnodes was to be able to declare nvmem cells. Hence, the partition property does not really apply directly here, let's instead reference nvmem-cells.yaml first. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/partitions/qcom,smem-part.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-par= t.yaml b/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.ya= ml index 805eabece7c8..681a51f5257c 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml @@ -23,7 +23,7 @@ properties: =20 patternProperties: "^partition-[0-9a-z]+$": - $ref: partition.yaml# + $ref: nvmem-cells.yaml =20 required: - compatible --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 A99A7C4332F for ; Fri, 4 Nov 2022 16:48:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232144AbiKDQsv (ORCPT ); Fri, 4 Nov 2022 12:48:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231944AbiKDQrq (ORCPT ); Fri, 4 Nov 2022 12:47:46 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 647BA40472; Fri, 4 Nov 2022 09:47:35 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 9FFE84000E; Fri, 4 Nov 2022 16:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mfySvTw9F2sJ/4rPEiimBhliYhZWKXtJT7ol/a3yWK0=; b=BAwtPBJzb+XlqqpzqieVXHyZ3DejlH1PGnv/FsZyapr/V2YWOZGiYPcv+6xIEzpLbVjw/c fUyGzoqcJOQox8RZGEOSZ2zD3W51FvanYVppRulSmoXultO3xknnTd/N+GPCe60NEUl2gD yVMl+O6I/m5rWYz0DRHjv91tN67ZaaMgfReGqNYgeNnrhdF3ebkguBt3om0so6+f/E+6dW ig1moSkpc7vgCrgVbkJjfOxRwmwwKb8KuaTO4fG57mRlhpvkbIDA+ggpL8GbAKr/OM5wZF Tl5kiid47R8wu7G2EFkgyVjrU9Oc3JeAKIcjk6UynWKN/+DPVCmGfJmN94Zxkg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 13/17] dt-bindings: mtd: nvmem-cells: Fix example Date: Fri, 4 Nov 2022 17:47:14 +0100 Message-Id: <20221104164718.1290859-14-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 There is no such thing as a "ranges" property within an nvmem-cells node. There is no use of it, it is anyway not pictured anywhere that this is valid, so drop it from the example. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/partitions/nvmem-cells.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.y= aml b/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml index 5cdd2efa9132..ca18892eacc7 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml @@ -84,7 +84,6 @@ examples: compatible =3D "nvmem-cells"; label =3D "calibration"; reg =3D <0xf00000 0x100000>; - ranges =3D <0 0xf00000 0x100000>; #address-cells =3D <1>; #size-cells =3D <1>; =20 --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 76CBBC433FE for ; Fri, 4 Nov 2022 16:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232097AbiKDQsj (ORCPT ); Fri, 4 Nov 2022 12:48:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231917AbiKDQro (ORCPT ); Fri, 4 Nov 2022 12:47:44 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BAE44731D; Fri, 4 Nov 2022 09:47:36 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id DDCAF4000C; Fri, 4 Nov 2022 16:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+/lDN07HzIVXyCOe6g7TO1CLyUYJmJJyGrTHG8Es/Kw=; b=IKn83bltza7mii6W7ZBV5MTpEknwv96h9DUbfImGD2IJgAJsWRiLGMEQE02jRLTfjcCHXd 9fLXANAkFTZ2XIK3H7cLQXYosjmmrwLLZEg35MsMFa50AyhHIJ3GS2WSKOVdUHAPfqvWdA 8kb782HO0TXhJV6KLU1oaVmEzF10ivlT0zE4vfIQ+lvPZRIJ/IJqgiTBtVP7Qv+uhVc9ce f0wMNIQVmhKHknhzs9Vgc38dcX0omsloSvxmMgDBLpICaK2bYmuOVtG8ENeNaof8cINW7x Vhu+QqG/ctWTEoDmLz80nzVKoZ10JKBKLqr6ESvIc/L1cnx0j6hJSnGsGktDlg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 14/17] dt-bindings: mtd: nvmem-cells: Inherit from MTD partitions Date: Fri, 4 Nov 2022 17:47:15 +0100 Message-Id: <20221104164718.1290859-15-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 The aim of MTD nvmem-cells is to treat MTD partitions as NVMEM providers. Hence, MTD partition properties are valid here. Let's reference mtd/partition.yaml which gives us a chance to drop "additionalProperties: true" in favor of "unevaluatedProperties: false". Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../devicetree/bindings/mtd/partitions/nvmem-cells.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.y= aml b/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml index ca18892eacc7..5474d63268dc 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml @@ -17,6 +17,7 @@ maintainers: - Ansuel Smith =20 allOf: + - $ref: /schemas/mtd/partitions/partition.yaml# - $ref: /schemas/nvmem/nvmem.yaml# =20 properties: @@ -26,7 +27,7 @@ properties: required: - compatible =20 -additionalProperties: true +unevaluatedProperties: false =20 examples: - | --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 6EBD0C4332F for ; Fri, 4 Nov 2022 16:48:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231989AbiKDQsy (ORCPT ); Fri, 4 Nov 2022 12:48:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231949AbiKDQrr (ORCPT ); Fri, 4 Nov 2022 12:47:47 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 192C14AF05; Fri, 4 Nov 2022 09:47:37 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id D92CB40003; Fri, 4 Nov 2022 16:47:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I4XXOMBEfkOnV0QqjTL56rdfmw5ub9qZ5YqwWMsqScM=; b=kACEsRxzfU7VRr3rXIFdBQuRKCNwXA/whF8DcKXCqTUeTFQ3e3W5msdthKkpzSBrUpMRJy atsfrvsau1gDCjGTk2uov+YZlkdvqTTfC7h4TPZIVcUCoLrfNqUlSdpgv1uOICC46hF5F8 LFGy6zX7/NUWmkbNoNdSuwnifcjVD9EPgXSz/s+L0rywdOq6hYPo4v/okslvgXFgR/lQv3 44rCmB2dQXYaZICplkg4B+NQI91NMz/FHT6Xptkc22toY3dnQl8uvccj3ZIK32v2IposLc vEh14j7OYkskKv0xJSMttYiN+qlDl4NQFMp9vnWqexlqBRgG3SugyJq7cLq8xg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal , Rob Herring Subject: [PATCH v2 15/17] dt-bindings: mtd: Argue in favor of keeping additionalProperties set to true Date: Fri, 4 Nov 2022 17:47:16 +0100 Message-Id: <20221104164718.1290859-16-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 In most cases we try to avoid it but in some cases this is needed. Clarify why by adding a small comment. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/mtd.yaml | 1 + Documentation/devicetree/bindings/mtd/nand-chip.yaml | 1 + Documentation/devicetree/bindings/mtd/nand-controller.yaml | 1 + Documentation/devicetree/bindings/mtd/partitions/partition.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/mtd.yaml b/Documentation= /devicetree/bindings/mtd/mtd.yaml index 2494ec2d80e3..9ee285b7d162 100644 --- a/Documentation/devicetree/bindings/mtd/mtd.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd.yaml @@ -60,6 +60,7 @@ patternProperties: required: - compatible =20 +# This is a generic file other binding inherit from additionalProperties: true =20 examples: diff --git a/Documentation/devicetree/bindings/mtd/nand-chip.yaml b/Documen= tation/devicetree/bindings/mtd/nand-chip.yaml index 8d5d2d3ef56b..6e2dc025d694 100644 --- a/Documentation/devicetree/bindings/mtd/nand-chip.yaml +++ b/Documentation/devicetree/bindings/mtd/nand-chip.yaml @@ -70,4 +70,5 @@ properties: required: - reg =20 +# This file can be referenced by more specific devices (like spi-nands) additionalProperties: true diff --git a/Documentation/devicetree/bindings/mtd/nand-controller.yaml b/D= ocumentation/devicetree/bindings/mtd/nand-controller.yaml index 3f2a1480e1eb..220aa2c8c0b5 100644 --- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml +++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml @@ -129,6 +129,7 @@ required: - "#address-cells" - "#size-cells" =20 +# This is a generic file other binding inherit from and extend additionalProperties: true =20 examples: diff --git a/Documentation/devicetree/bindings/mtd/partitions/partition.yam= l b/Documentation/devicetree/bindings/mtd/partitions/partition.yaml index f1a02d840b12..8bdec706ba9b 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partition.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partition.yaml @@ -60,4 +60,5 @@ then: $nodename: pattern: '^partition-.*$' =20 +# This is a generic file other binding inherit from and extend additionalProperties: true --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 A920DC4332F for ; Fri, 4 Nov 2022 16:49:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231995AbiKDQs7 (ORCPT ); Fri, 4 Nov 2022 12:48:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231963AbiKDQrr (ORCPT ); Fri, 4 Nov 2022 12:47:47 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F9B64045F; Fri, 4 Nov 2022 09:47:39 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 054A640010; Fri, 4 Nov 2022 16:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p+yDyoG2qKYEY8YhhZqOq33UNeQMIcC6DN9z91vnmHU=; b=UmO901a52ytowHIFKqWsssrz0q2L1duxwvZJhYgieKG9bUocsqFTtvElJWVaGB8ddioOWN ZuabgYv/+9tp0CoJl3yt+Xzm0XI+MaJsUkakpt6gbP6Gs0b+i2/J9WuKi3xoal9jXY+w41 QsPcXaLoeXxHSCdtGVTBdG21tToL+LZlJUnetwXh5/wHIZeeKPTv09kx5fo4XclY/Sz9Y+ 0ynrzEsuVga93VrFPYrDYCmmWHKN7C19v1qSp3WWw8vtN5LeYWvZpvA7RupK6TavdWm3Mu LylqSslmYbU40+Xv932L+ucAk8cBfSSeV3flgDLV2iGvYvUOKJXRRZyFCSqIuw== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal , Rob Herring Subject: [PATCH v2 16/17] dt-bindings: mtd: Drop object types when referencing other files Date: Fri, 4 Nov 2022 17:47:17 +0100 Message-Id: <20221104164718.1290859-17-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 Setting an object type is redundant when a reference is made, so drop these useless lines. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/mtd/mtd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mtd/mtd.yaml b/Documentation= /devicetree/bindings/mtd/mtd.yaml index 9ee285b7d162..78da129e9985 100644 --- a/Documentation/devicetree/bindings/mtd/mtd.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd.yaml @@ -43,7 +43,6 @@ patternProperties: deprecated: true =20 "^otp(-[0-9]+)?$": - type: object $ref: ../nvmem/nvmem.yaml# =20 description: | --=20 2.34.1 From nobody Thu Apr 9 10:55:11 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 F41E3C4332F for ; Fri, 4 Nov 2022 16:49:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232010AbiKDQtI (ORCPT ); Fri, 4 Nov 2022 12:49:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232001AbiKDQru (ORCPT ); Fri, 4 Nov 2022 12:47:50 -0400 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86DD04AF18; Fri, 4 Nov 2022 09:47:40 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 34C0C40012; Fri, 4 Nov 2022 16:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1667580459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=18t/7qSaRnk2gS9dcNFVNFqLhCWEty8oMGunULJHDD4=; b=XTi+tbo+jHaN75MxBIfHEQmVt8fYho5DQToDolW2Qa5bdHDjQOZg/KBPXkeuQiFePkC88l GbZozM56F3Mcw2HxQ+2N96mM8aJ9r2bQJ7uUYSMMs0aO3GVsp8WSlAf87RpK4UpGHeb8fh GRYKeg1VLi7GgqebJaI6pi2/V9g6oSMtx2Mh2hZIT36zULStpcZe5CHFRjGA1waXwE5zal /CPjxPlfstWdYoPjjTOLcF4e7uQfgSAkkGVZD8Ji1QNp/8QtEs+EIn898lyXYcE5ESqqA0 F3RG19CuQ67LOhc/UIkTfTpTCNSUb6x9GbkGyo9ymOpt++3g8auK6aWCG0G6dg== From: Miquel Raynal To: Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Richard Weinberger , Vignesh Raghavendra , Tudor Ambarus , Pratyush Yadav , Michael Walle , , Thomas Petazzoni , Srinivas Kandagatla , , Miquel Raynal Subject: [PATCH v2 17/17] dt-bindings: mtd: Standardize the style in the examples Date: Fri, 4 Nov 2022 17:47:18 +0100 Message-Id: <20221104164718.1290859-18-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104164718.1290859-1-miquel.raynal@bootlin.com> References: <20221104164718.1290859-1-miquel.raynal@bootlin.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 As recently requested by the binding maintaines, let's use 4 spaces in the examples. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring --- .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 30 ++--- .../bindings/mtd/brcm,brcmnand.yaml | 80 ++++++------ .../devicetree/bindings/mtd/denali,nand.yaml | 2 +- .../devicetree/bindings/mtd/ingenic,nand.yaml | 114 +++++++++--------- .../bindings/mtd/intel,lgm-ebunand.yaml | 36 +++--- .../bindings/mtd/microchip,mchp48l640.yaml | 14 +-- .../mtd/partitions/qcom,smem-part.yaml | 28 ++--- .../devicetree/bindings/mtd/qcom,nandc.yaml | 114 +++++++++--------- .../bindings/mtd/st,stm32-fmc2-nand.yaml | 47 ++++---- .../bindings/mtd/ti,am654-hbmc.yaml | 36 +++--- 10 files changed, 251 insertions(+), 250 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml= b/Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml index 023f3ef0fa13..e552875040e2 100644 --- a/Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml +++ b/Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml @@ -34,20 +34,20 @@ unevaluatedProperties: false examples: - | smcc: memory-controller@e000e000 { - compatible =3D "arm,pl353-smc-r2p1", "arm,primecell"; - reg =3D <0xe000e000 0x0001000>; - clock-names =3D "memclk", "apb_pclk"; - clocks =3D <&clkc 11>, <&clkc 44>; - ranges =3D <0x0 0x0 0xe1000000 0x1000000 /* Nand CS region */ - 0x1 0x0 0xe2000000 0x2000000 /* SRAM/NOR CS0 region */ - 0x2 0x0 0xe4000000 0x2000000>; /* SRAM/NOR CS1 region */ - #address-cells =3D <2>; - #size-cells =3D <1>; + compatible =3D "arm,pl353-smc-r2p1", "arm,primecell"; + reg =3D <0xe000e000 0x0001000>; + clock-names =3D "memclk", "apb_pclk"; + clocks =3D <&clkc 11>, <&clkc 44>; + ranges =3D <0x0 0x0 0xe1000000 0x1000000 /* Nand CS region */ + 0x1 0x0 0xe2000000 0x2000000 /* SRAM/NOR CS0 region */ + 0x2 0x0 0xe4000000 0x2000000>; /* SRAM/NOR CS1 region */ + #address-cells =3D <2>; + #size-cells =3D <1>; =20 - nfc0: nand-controller@0,0 { - compatible =3D "arm,pl353-nand-r2p1"; - reg =3D <0 0 0x1000000>; - #address-cells =3D <1>; - #size-cells =3D <0>; - }; + nfc0: nand-controller@0,0 { + compatible =3D "arm,pl353-nand-r2p1"; + reg =3D <0 0 0x1000000>; + #address-cells =3D <1>; + #size-cells =3D <0>; + }; }; diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Doc= umentation/devicetree/bindings/mtd/brcm,brcmnand.yaml index dd5a64969e37..f9518d39fbbd 100644 --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml @@ -184,51 +184,51 @@ required: examples: - | nand-controller@f0442800 { - compatible =3D "brcm,brcmnand-v7.0", "brcm,brcmnand"; - reg =3D <0xf0442800 0x600>, - <0xf0443000 0x100>; - reg-names =3D "nand", "flash-dma"; - interrupt-parent =3D <&hif_intr2_intc>; - interrupts =3D <24>, <4>; + compatible =3D "brcm,brcmnand-v7.0", "brcm,brcmnand"; + reg =3D <0xf0442800 0x600>, + <0xf0443000 0x100>; + reg-names =3D "nand", "flash-dma"; + interrupt-parent =3D <&hif_intr2_intc>; + interrupts =3D <24>, <4>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + nand@1 { + compatible =3D "brcm,nandcs"; + reg =3D <1>; // Chip select 1 + nand-on-flash-bbt; + nand-ecc-strength =3D <12>; + nand-ecc-step-size =3D <512>; =20 #address-cells =3D <1>; - #size-cells =3D <0>; - - nand@1 { - compatible =3D "brcm,nandcs"; - reg =3D <1>; // Chip select 1 - nand-on-flash-bbt; - nand-ecc-strength =3D <12>; - nand-ecc-step-size =3D <512>; - - #address-cells =3D <1>; - #size-cells =3D <1>; - }; + #size-cells =3D <1>; + }; }; - | nand-controller@10000200 { - compatible =3D "brcm,nand-bcm63168", "brcm,nand-bcm6368", - "brcm,brcmnand-v4.0", "brcm,brcmnand"; - reg =3D <0x10000200 0x180>, - <0x100000b0 0x10>, - <0x10000600 0x200>; - reg-names =3D "nand", "nand-int-base", "nand-cache"; - interrupt-parent =3D <&periph_intc>; - interrupts =3D <50>; - clocks =3D <&periph_clk 20>; - clock-names =3D "nand"; + compatible =3D "brcm,nand-bcm63168", "brcm,nand-bcm6368", + "brcm,brcmnand-v4.0", "brcm,brcmnand"; + reg =3D <0x10000200 0x180>, + <0x100000b0 0x10>, + <0x10000600 0x200>; + reg-names =3D "nand", "nand-int-base", "nand-cache"; + interrupt-parent =3D <&periph_intc>; + interrupts =3D <50>; + clocks =3D <&periph_clk 20>; + clock-names =3D "nand"; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + nand@0 { + compatible =3D "brcm,nandcs"; + reg =3D <0>; + nand-on-flash-bbt; + nand-ecc-strength =3D <1>; + nand-ecc-step-size =3D <512>; =20 #address-cells =3D <1>; - #size-cells =3D <0>; - - nand@0 { - compatible =3D "brcm,nandcs"; - reg =3D <0>; - nand-on-flash-bbt; - nand-ecc-strength =3D <1>; - nand-ecc-step-size =3D <512>; - - #address-cells =3D <1>; - #size-cells =3D <1>; - }; + #size-cells =3D <1>; + }; }; diff --git a/Documentation/devicetree/bindings/mtd/denali,nand.yaml b/Docum= entation/devicetree/bindings/mtd/denali,nand.yaml index 1307ed7e7fc6..0be83ad42970 100644 --- a/Documentation/devicetree/bindings/mtd/denali,nand.yaml +++ b/Documentation/devicetree/bindings/mtd/denali,nand.yaml @@ -145,6 +145,6 @@ examples: #size-cells =3D <0>; =20 nand@0 { - reg =3D <0>; + reg =3D <0>; }; }; diff --git a/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml b/Docu= mentation/devicetree/bindings/mtd/ingenic,nand.yaml index 90dbc5eba1e7..a811a512ecc5 100644 --- a/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml +++ b/Documentation/devicetree/bindings/mtd/ingenic,nand.yaml @@ -58,78 +58,78 @@ examples: - | #include memory-controller@13410000 { - compatible =3D "ingenic,jz4780-nemc"; - reg =3D <0x13410000 0x10000>; - #address-cells =3D <2>; - #size-cells =3D <1>; - ranges =3D <1 0 0x1b000000 0x1000000>, - <2 0 0x1a000000 0x1000000>, - <3 0 0x19000000 0x1000000>, - <4 0 0x18000000 0x1000000>, - <5 0 0x17000000 0x1000000>, - <6 0 0x16000000 0x1000000>; + compatible =3D "ingenic,jz4780-nemc"; + reg =3D <0x13410000 0x10000>; + #address-cells =3D <2>; + #size-cells =3D <1>; + ranges =3D <1 0 0x1b000000 0x1000000>, + <2 0 0x1a000000 0x1000000>, + <3 0 0x19000000 0x1000000>, + <4 0 0x18000000 0x1000000>, + <5 0 0x17000000 0x1000000>, + <6 0 0x16000000 0x1000000>; =20 - clocks =3D <&cgu JZ4780_CLK_NEMC>; + clocks =3D <&cgu JZ4780_CLK_NEMC>; =20 - nand-controller@1 { - compatible =3D "ingenic,jz4780-nand"; - reg =3D <1 0 0x1000000>; + nand-controller@1 { + compatible =3D "ingenic,jz4780-nand"; + reg =3D <1 0 0x1000000>; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - ecc-engine =3D <&bch>; + ecc-engine =3D <&bch>; =20 - ingenic,nemc-tAS =3D <10>; - ingenic,nemc-tAH =3D <5>; - ingenic,nemc-tBP =3D <10>; - ingenic,nemc-tAW =3D <15>; - ingenic,nemc-tSTRV =3D <100>; + ingenic,nemc-tAS =3D <10>; + ingenic,nemc-tAH =3D <5>; + ingenic,nemc-tBP =3D <10>; + ingenic,nemc-tAW =3D <15>; + ingenic,nemc-tSTRV =3D <100>; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pins_nemc>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pins_nemc>; =20 - nand@1 { - reg =3D <1>; + nand@1 { + reg =3D <1>; =20 - nand-ecc-step-size =3D <1024>; - nand-ecc-strength =3D <24>; - nand-ecc-mode =3D "hw"; - nand-on-flash-bbt; + nand-ecc-step-size =3D <1024>; + nand-ecc-strength =3D <24>; + nand-ecc-mode =3D "hw"; + nand-on-flash-bbt; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pins_nemc_cs1>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pins_nemc_cs1>; =20 - partitions { - compatible =3D "fixed-partitions"; - #address-cells =3D <2>; - #size-cells =3D <2>; + partitions { + compatible =3D "fixed-partitions"; + #address-cells =3D <2>; + #size-cells =3D <2>; =20 - partition@0 { - label =3D "u-boot-spl"; - reg =3D <0x0 0x0 0x0 0x800000>; - }; + partition@0 { + label =3D "u-boot-spl"; + reg =3D <0x0 0x0 0x0 0x800000>; + }; =20 - partition@800000 { - label =3D "u-boot"; - reg =3D <0x0 0x800000 0x0 0x200000>; - }; + partition@800000 { + label =3D "u-boot"; + reg =3D <0x0 0x800000 0x0 0x200000>; + }; =20 - partition@a00000 { - label =3D "u-boot-env"; - reg =3D <0x0 0xa00000 0x0 0x200000>; - }; + partition@a00000 { + label =3D "u-boot-env"; + reg =3D <0x0 0xa00000 0x0 0x200000>; + }; =20 - partition@c00000 { - label =3D "boot"; - reg =3D <0x0 0xc00000 0x0 0x4000000>; - }; + partition@c00000 { + label =3D "boot"; + reg =3D <0x0 0xc00000 0x0 0x4000000>; + }; =20 - partition@4c00000 { - label =3D "system"; - reg =3D <0x0 0x4c00000 0x1 0xfb400000>; + partition@4c00000 { + label =3D "system"; + reg =3D <0x0 0x4c00000 0x1 0xfb400000>; + }; + }; }; - }; }; - }; }; diff --git a/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml b= /Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml index d455b75a0b0b..8c62c7d3d0cd 100644 --- a/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml +++ b/Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml @@ -67,25 +67,25 @@ unevaluatedProperties: false examples: - | nand-controller@e0f00000 { - compatible =3D "intel,lgm-ebunand"; - reg =3D <0xe0f00000 0x100>, - <0xe1000000 0x300>, - <0xe1400000 0x8000>, - <0xe1c00000 0x1000>, - <0x17400000 0x4>, - <0x17c00000 0x4>; - reg-names =3D "ebunand", "hsnand", "nand_cs0", "nand_cs1", - "addr_sel0", "addr_sel1"; - clocks =3D <&cgu0 125>; - dmas =3D <&dma0 8>, <&dma0 9>; - dma-names =3D "tx", "rx"; - #address-cells =3D <1>; - #size-cells =3D <0>; + compatible =3D "intel,lgm-ebunand"; + reg =3D <0xe0f00000 0x100>, + <0xe1000000 0x300>, + <0xe1400000 0x8000>, + <0xe1c00000 0x1000>, + <0x17400000 0x4>, + <0x17c00000 0x4>; + reg-names =3D "ebunand", "hsnand", "nand_cs0", "nand_cs1", + "addr_sel0", "addr_sel1"; + clocks =3D <&cgu0 125>; + dmas =3D <&dma0 8>, <&dma0 9>; + dma-names =3D "tx", "rx"; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - nand@0 { - reg =3D <0>; - nand-ecc-mode =3D "hw"; - }; + nand@0 { + reg =3D <0>; + nand-ecc-mode =3D "hw"; + }; }; =20 ... diff --git a/Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yam= l b/Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml index 8cc2a7ceb5fb..ea9450fe7c9f 100644 --- a/Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml +++ b/Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml @@ -34,13 +34,13 @@ unevaluatedProperties: false examples: - | spi { - #address-cells =3D <1>; - #size-cells =3D <0>; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - eeram@0 { - compatible =3D "microchip,48l640"; - reg =3D <0>; - spi-max-frequency =3D <20000000>; - }; + eeram@0 { + compatible =3D "microchip,48l640"; + reg =3D <0>; + spi-max-frequency =3D <20000000>; + }; }; ... diff --git a/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-par= t.yaml b/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.ya= ml index 681a51f5257c..61d12bda356e 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml @@ -41,22 +41,22 @@ examples: - | /* Example declaring dynamic partition */ flash { - partitions { - compatible =3D "qcom,smem-part"; + partitions { + compatible =3D "qcom,smem-part"; =20 - partition-art { - compatible =3D "nvmem-cells"; - #address-cells =3D <1>; - #size-cells =3D <1>; - label =3D "0:art"; + partition-art { + compatible =3D "nvmem-cells"; + #address-cells =3D <1>; + #size-cells =3D <1>; + label =3D "0:art"; =20 - macaddr_art_0: macaddr@0 { - reg =3D <0x0 0x6>; - }; + macaddr_art_0: macaddr@0 { + reg =3D <0x0 0x6>; + }; =20 - macaddr_art_6: macaddr@6 { - reg =3D <0x6 0x6>; - }; + macaddr_art_6: macaddr@6 { + reg =3D <0x6 0x6>; + }; + }; }; - }; }; diff --git a/Documentation/devicetree/bindings/mtd/qcom,nandc.yaml b/Docume= ntation/devicetree/bindings/mtd/qcom,nandc.yaml index 3cc90c64e974..07024ee45951 100644 --- a/Documentation/devicetree/bindings/mtd/qcom,nandc.yaml +++ b/Documentation/devicetree/bindings/mtd/qcom,nandc.yaml @@ -136,85 +136,85 @@ examples: - | #include nand-controller@1ac00000 { - compatible =3D "qcom,ipq806x-nand"; - reg =3D <0x1ac00000 0x800>; + compatible =3D "qcom,ipq806x-nand"; + reg =3D <0x1ac00000 0x800>; =20 - clocks =3D <&gcc EBI2_CLK>, - <&gcc EBI2_AON_CLK>; - clock-names =3D "core", "aon"; + clocks =3D <&gcc EBI2_CLK>, + <&gcc EBI2_AON_CLK>; + clock-names =3D "core", "aon"; =20 - dmas =3D <&adm_dma 3>; - dma-names =3D "rxtx"; - qcom,cmd-crci =3D <15>; - qcom,data-crci =3D <3>; + dmas =3D <&adm_dma 3>; + dma-names =3D "rxtx"; + qcom,cmd-crci =3D <15>; + qcom,data-crci =3D <3>; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - nand@0 { - reg =3D <0>; + nand@0 { + reg =3D <0>; =20 - nand-ecc-strength =3D <4>; - nand-bus-width =3D <8>; + nand-ecc-strength =3D <4>; + nand-bus-width =3D <8>; =20 - qcom,boot-partitions =3D <0x0 0x58a0000>; + qcom,boot-partitions =3D <0x0 0x58a0000>; =20 - partitions { - compatible =3D "fixed-partitions"; - #address-cells =3D <1>; - #size-cells =3D <1>; + partitions { + compatible =3D "fixed-partitions"; + #address-cells =3D <1>; + #size-cells =3D <1>; =20 - partition@0 { - label =3D "boot-nand"; - reg =3D <0 0x58a0000>; - }; + partition@0 { + label =3D "boot-nand"; + reg =3D <0 0x58a0000>; + }; =20 - partition@58a0000 { - label =3D "fs-nand"; - reg =3D <0x58a0000 0x4000000>; - }; + partition@58a0000 { + label =3D "fs-nand"; + reg =3D <0x58a0000 0x4000000>; + }; + }; }; - }; }; =20 #include nand-controller@79b0000 { - compatible =3D "qcom,ipq4019-nand"; - reg =3D <0x79b0000 0x1000>; + compatible =3D "qcom,ipq4019-nand"; + reg =3D <0x79b0000 0x1000>; =20 - clocks =3D <&gcc GCC_QPIC_CLK>, - <&gcc GCC_QPIC_AHB_CLK>; - clock-names =3D "core", "aon"; + clocks =3D <&gcc GCC_QPIC_CLK>, + <&gcc GCC_QPIC_AHB_CLK>; + clock-names =3D "core", "aon"; =20 - dmas =3D <&qpicbam 0>, - <&qpicbam 1>, - <&qpicbam 2>; - dma-names =3D "tx", "rx", "cmd"; + dmas =3D <&qpicbam 0>, + <&qpicbam 1>, + <&qpicbam 2>; + dma-names =3D "tx", "rx", "cmd"; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - nand@0 { - reg =3D <0>; - nand-ecc-strength =3D <4>; - nand-bus-width =3D <8>; + nand@0 { + reg =3D <0>; + nand-ecc-strength =3D <4>; + nand-bus-width =3D <8>; =20 - partitions { - compatible =3D "fixed-partitions"; - #address-cells =3D <1>; - #size-cells =3D <1>; + partitions { + compatible =3D "fixed-partitions"; + #address-cells =3D <1>; + #size-cells =3D <1>; =20 - partition@0 { - label =3D "boot-nand"; - reg =3D <0 0x58a0000>; - }; + partition@0 { + label =3D "boot-nand"; + reg =3D <0 0x58a0000>; + }; =20 - partition@58a0000 { - label =3D "fs-nand"; - reg =3D <0x58a0000 0x4000000>; - }; + partition@58a0000 { + label =3D "fs-nand"; + reg =3D <0x58a0000 0x4000000>; + }; + }; }; - }; }; =20 ... diff --git a/Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml = b/Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml index eab8ea3da1fa..8cbfa1504a0f 100644 --- a/Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml @@ -101,31 +101,32 @@ examples: #include #include #include + nand-controller@58002000 { - compatible =3D "st,stm32mp15-fmc2"; - reg =3D <0x58002000 0x1000>, - <0x80000000 0x1000>, - <0x88010000 0x1000>, - <0x88020000 0x1000>, - <0x81000000 0x1000>, - <0x89010000 0x1000>, - <0x89020000 0x1000>; - interrupts =3D ; - dmas =3D <&mdma1 20 0x2 0x12000a02 0x0 0x0>, - <&mdma1 20 0x2 0x12000a08 0x0 0x0>, - <&mdma1 21 0x2 0x12000a0a 0x0 0x0>; - dma-names =3D "tx", "rx", "ecc"; - clocks =3D <&rcc FMC_K>; - resets =3D <&rcc FMC_R>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - nand@0 { - reg =3D <0>; - nand-on-flash-bbt; + compatible =3D "st,stm32mp15-fmc2"; + reg =3D <0x58002000 0x1000>, + <0x80000000 0x1000>, + <0x88010000 0x1000>, + <0x88020000 0x1000>, + <0x81000000 0x1000>, + <0x89010000 0x1000>, + <0x89020000 0x1000>; + interrupts =3D ; + dmas =3D <&mdma1 20 0x2 0x12000a02 0x0 0x0>, + <&mdma1 20 0x2 0x12000a08 0x0 0x0>, + <&mdma1 21 0x2 0x12000a0a 0x0 0x0>; + dma-names =3D "tx", "rx", "ecc"; + clocks =3D <&rcc FMC_K>; + resets =3D <&rcc FMC_R>; #address-cells =3D <1>; - #size-cells =3D <1>; - }; + #size-cells =3D <0>; + + nand@0 { + reg =3D <0>; + nand-on-flash-bbt; + #address-cells =3D <1>; + #size-cells =3D <1>; + }; }; =20 ... diff --git a/Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml b/Doc= umentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml index 30b458c41cac..4774c92e7fc4 100644 --- a/Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml +++ b/Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml @@ -44,26 +44,26 @@ additionalProperties: false examples: - | bus { - #address-cells =3D <2>; - #size-cells =3D <2>; - - hbmc: memory-controller@47034000 { - compatible =3D "ti,am654-hbmc"; - reg =3D <0x0 0x47034000 0x0 0x100>, - <0x5 0x00000000 0x1 0x0000000>; - ranges =3D <0x0 0x0 0x5 0x00000000 0x4000000>, /* CS0 - 64MB */ - <0x1 0x0 0x5 0x04000000 0x4000000>; /* CS1 - 64MB */ - clocks =3D <&k3_clks 102 0>; #address-cells =3D <2>; - #size-cells =3D <1>; - power-domains =3D <&k3_pds 55>; - mux-controls =3D <&hbmc_mux 0>; + #size-cells =3D <2>; =20 - flash@0,0 { - compatible =3D "cypress,hyperflash", "cfi-flash"; - reg =3D <0x0 0x0 0x4000000>; - #address-cells =3D <1>; + hbmc: memory-controller@47034000 { + compatible =3D "ti,am654-hbmc"; + reg =3D <0x0 0x47034000 0x0 0x100>, + <0x5 0x00000000 0x1 0x0000000>; + ranges =3D <0x0 0x0 0x5 0x00000000 0x4000000>, /* CS0 - 64MB */ + <0x1 0x0 0x5 0x04000000 0x4000000>; /* CS1 - 64MB */ + clocks =3D <&k3_clks 102 0>; + #address-cells =3D <2>; #size-cells =3D <1>; + power-domains =3D <&k3_pds 55>; + mux-controls =3D <&hbmc_mux 0>; + + flash@0,0 { + compatible =3D "cypress,hyperflash", "cfi-flash"; + reg =3D <0x0 0x0 0x4000000>; + #address-cells =3D <1>; + #size-cells =3D <1>; + }; }; - }; }; --=20 2.34.1