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 D6C8EC4332F for ; Mon, 14 Nov 2022 09:03:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236820AbiKNJDv (ORCPT ); Mon, 14 Nov 2022 04:03:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236784AbiKNJDf (ORCPT ); Mon, 14 Nov 2022 04:03:35 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A0DF1D0FC; Mon, 14 Nov 2022 01:03:21 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 7E557FF80F; Mon, 14 Nov 2022 09:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AuBIlMKCZZIuUuj5REra2VmiQWnswPU4OmSCifTO9M0=; b=OwkgcgfymZPogF7Sg5bekGuc6M86gRrTodsVWU1fvBH43cK9P/rZ+SigCoZt65MP4v4xLX /nl+ooXqfGRb4ZsGjdEaZVA0C3UpBZHif1G4mIFRQl9WajX7g+A5XManeA95+sfwki6Abu sJOB/ijxtZ2TPqHPmsHJ1F+r0ixXxlx1q0QndSe1Izczop6Rk4tfuHFx0Mjat6F7s7NhiO xOorKDNKYCNMQpZQQBc5ky7teyQvtLrsRNQK0pp0G7cus03SNr7TiphU9MibQ+MiKCx16l /RkSXquGK9DJeJv/mDGxnLyLhhtYvm/x3A2gm60xH5X/9eIWxc9l76qOJdKRLg== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 01/17] dt-bindings: mtd: Clarify all partition subnodes Date: Mon, 14 Nov 2022 10:02:59 +0100 Message-Id: <20221114090315.848208-2-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 9AE16C4332F for ; Mon, 14 Nov 2022 09:03:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236831AbiKNJDz (ORCPT ); Mon, 14 Nov 2022 04:03:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236785AbiKNJDf (ORCPT ); Mon, 14 Nov 2022 04:03:35 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC90AC7A; Mon, 14 Nov 2022 01:03:24 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id D8394FF813; Mon, 14 Nov 2022 09:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lncVZ4FVnBfjP1TrSlO1IJnUMYB8dLEhvsq2pKAQf7Y=; b=XdjK81IMXZi4RiFjjs4GuPr7KAfQWTBCNWmVyPUAYfIcRDHP5kEG9ckIuLkAijk4jWqLDd M9yJdlCS6y7eeypIMvCM2mkynTBWgQu1EGL70guw0SCBnbrjRlwVG7M+I8VNBdzDKZ9r6r JE9VChVgpFk/dW94e7L1aOSQOEXi7eH5Dbob6I4d/SrU21UXa+eKjog3fZDKeF8lOm4GJ/ y2Sw4ulstPnDZje4m6Z38F3CLAf3IgPwGTyT+Z67Q48w034qanOoiNKWWoRoOVPwsJdDJD Yi2kYm2wIEsmHn3I9LVpR2MI3P+gnUwA2u7UFy90rI7zTBmQaG06/bWSPk00hw== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 02/17] dt-bindings: mtd: Remove useless file about partitions Date: Mon, 14 Nov 2022 10:03:00 +0100 Message-Id: <20221114090315.848208-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 39F6CC433FE for ; Mon, 14 Nov 2022 09:04:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236795AbiKNJEH (ORCPT ); Mon, 14 Nov 2022 04:04:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236764AbiKNJDh (ORCPT ); Mon, 14 Nov 2022 04:03:37 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFD5938AF; Mon, 14 Nov 2022 01:03:28 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id E1669FF809; Mon, 14 Nov 2022 09:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Y3Ilf0k1Zb565CDODTPYfsRYtki95YJmPfK8ZRRt10=; b=U5weO7ep3Ye7minqImiXDZllYYNsMWXY4DLWkB4nhJMCeQqZoElaOHaHYcvxN5QPLtxbid pQmuUpD18pj6+/GqBS9rBAeb4xVM1eOo1WFfCyduOnVskQy4Ok1MMfGcaYtRW5mttK2OoA pC/w9tJq6mHpS81V28oBmN4Hh78a75QzpDSVQ4tfo8CLD1b+JZ0aXzz0YBpA8WJfd0d1gq nKETdlV7TG6ZlSBDZCPQpZqQ5VJ9qfMbqTOgbGF/CKLRMdmHmL/ZfCmTjzGd87GaZ7i4Wt VBnr6ARRELUaIg6bbhNp1zVNgrw1U1DhlhI4qLK0lNhf66X6bH6RFdHheUE+Hg== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 03/17] dt-bindings: mtd: nand-chip: Reference mtd.yaml Date: Mon, 14 Nov 2022 10:03:01 +0100 Message-Id: <20221114090315.848208-4-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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 30748C4332F for ; Mon, 14 Nov 2022 09:04:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236837AbiKNJEB (ORCPT ); Mon, 14 Nov 2022 04:04:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236765AbiKNJDh (ORCPT ); Mon, 14 Nov 2022 04:03:37 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CCF1D7A; Mon, 14 Nov 2022 01:03:29 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 081E1FF804; Mon, 14 Nov 2022 09:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=27rcuo1g8HrO5e+x9FwYP2uewF5xCWK5frETMU2TyEE=; b=TzzKM6ExToWVyxG2AZgulohBJxNh5wN30plZFgJEYXfR+BlurpAnvUEI93kKIsVaDYn9fW V3TwwvOPtmPWqLwYkEnqctCY0t6J8X/L7KBuBVLnbwXa9Gvpzzc9ddip+IFZIcjE3EQvkt 3THGvHvUKmEKmHpsaD18MrOPA1rKLCIY0fzYslD0jw41bdgZ8KDrC5stoU0SN/BXkvRREg pte8XBpbldPOKeksDGY1CoXUVPIrjZ0SLV00lIbhcsK9u9QIyXjPLcskj4SkhiQYXinMr3 c6L5fTjncGK1dD+NREo4TWm4IV8Cs92sPvns2rFsPoK7z3rH+415x7C3ourHQQ== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 04/17] dt-bindings: mtd: nand: Drop common properties already defined in generic files Date: Mon, 14 Nov 2022 10:03:02 +0100 Message-Id: <20221114090315.848208-5-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 8A49CC433FE for ; Mon, 14 Nov 2022 09:04:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236847AbiKNJEL (ORCPT ); Mon, 14 Nov 2022 04:04:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236753AbiKNJDh (ORCPT ); Mon, 14 Nov 2022 04:03:37 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF57730A; Mon, 14 Nov 2022 01:03:32 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id DAA50FF80D; Mon, 14 Nov 2022 09:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VZniRa34IJzcORswSbVxxaxEtzC6zBhF2xlhbxe8YXs=; b=giuozLSxpKkGYRAtRiy7/GNRi+LI3RQWeS/+x2NZZtX3f4OoqmEsJSvoBMuCWn1rcpM34S 06t9sHrgfFSr8zAUr/FWTj/PbDwkn75yZctx+GDeeZkisUhsnr4Oa/mjUe/pgXOfxzf2u/ RcQgzJ2xFyw7dvEA92Gs6TxEFIMyXiUCOgmeRm0gY+zWjWwzw02WzhmJzP7N3iU965Xu2Y dwzK3jAo0MlxBl+dEC8drl5o8mYqna6zF8WdI0YrVPfmCwC6r0pX0c5lydjf8HyJwn3DPf 0grSnK4D+arsp6tIci+cUpH6pRYlCUVfx4blC+YOdrhQKfkeJH0sr1cISxXHog== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 05/17] dt-bindings: mtd: nand: Standardize the child node name Date: Mon, 14 Nov 2022 10:03:03 +0100 Message-Id: <20221114090315.848208-6-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 5E298C433FE for ; Mon, 14 Nov 2022 09:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236857AbiKNJEV (ORCPT ); Mon, 14 Nov 2022 04:04:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236725AbiKNJDk (ORCPT ); Mon, 14 Nov 2022 04:03:40 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B49013E0D; Mon, 14 Nov 2022 01:03:36 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 00B5BFF814; Mon, 14 Nov 2022 09:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=abWxBYqdkWoQQQ3GX9Ts6R6Hk4Vd1Cu/4zxI2EIxg38=; b=Vx8uXQPeIudcKPHv0cv4vSdQKXGtNvXUAKz2bssWEm7L8914U7EQ3bSdC08XNv/m1t864m 7Q3WyMg2Nxxt2MonG7/VEewHlzRAle+KnJtXc1TbAz0/h0SQB4s1jGf9T8zvC2HXWYTJUX rPO6Q2SkF4deIHBhvUIPxDaYEx5DgKBWhaUpbG5sok6S4nCD5FQUSZW34kXqJo7/CjG35h pA7IAjVc2pd8inw8POVZw5Hx5GGZbhTIarPrHDFR+BHbaamtdcEGNT63dnp0pQzC9rgNrZ jcXN94kxIBb1rdNGE4z5mkVOM8waFtBIKW+liCcHLgIIX3kef1fs8TIAB+lkuQ== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 06/17] dt-bindings: mtd: ingenic: Mark partitions in the controller node as deprecated Date: Mon, 14 Nov 2022 10:03:04 +0100 Message-Id: <20221114090315.848208-7-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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 A864AC433FE for ; Mon, 14 Nov 2022 09:04:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236782AbiKNJEY (ORCPT ); Mon, 14 Nov 2022 04:04:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236755AbiKNJDn (ORCPT ); Mon, 14 Nov 2022 04:03:43 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F1FE25C9; Mon, 14 Nov 2022 01:03:40 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 08016FF802; Mon, 14 Nov 2022 09:03:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jgUll1fxlsNo04DlGgybxKu379cOxJAzo1HQkDdb+Qo=; b=l4xs2676U1pQOknyH9fqDpMzMkTRIOFkWzTFi6wkdFM+iXSGHGlYXdn3L8+QsClT2lDF54 vE1KS4zB2ghyi88sSiUZtf0yptFp9t2nvgS5kReBo/W5SaCBSX6MxI3bPQpXR3tT5OmVWH Rkitf/J5ztmMu5pO4Dr22sdsNZQ6D4YIbpvTOS1CaYw35qNe6zKAS+ynHePeb9qCMOES5K 5EWYyAihxZKrTYnvHXGlvmffeOdRjbuf5OI2s53m4MCKjROCbCXYn8h2DxdCt7BKcXAwwx 3JVuBEOgO468pU7LJ3c30tIzg7eW7OTsPuLpE/1qo7gxq68N/tn0CIY8ttGT6w== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 07/17] dt-bindings: mtd: onenand: Mention the expected node name Date: Mon, 14 Nov 2022 10:03:05 +0100 Message-Id: <20221114090315.848208-8-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 3102AC433FE for ; Mon, 14 Nov 2022 09:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236772AbiKNJE1 (ORCPT ); Mon, 14 Nov 2022 04:04:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236758AbiKNJDo (ORCPT ); Mon, 14 Nov 2022 04:03:44 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F02DF1A3A2; Mon, 14 Nov 2022 01:03:42 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id D7972FF808; Mon, 14 Nov 2022 09:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PyU/TfI7zG+vFv5AqFpSCNXPLiST9CWSE91HtqUC5QU=; b=ALFHtwkDEZnD7s7RXo5XGBYtlV7xf8OA/UzzOLAwjOup3Lso7zhlnRXwQ0gRLSPRMDiwyk 5VIBEbN4EJ9FqjF1yg5dTQ/PfpMrjY+GRq1dQOhOtvdPucEj6SuwBOzBTpXipmhPGE/Huh NZtGVLpnEqIKjqCZS0491w5CIECHeZQTnDg7O+Rkq4KQsQAPkEm3Ue0eDIw372+kX0G+jV H5IBVXOg1q7upLRwHhSqXVJoOBE8kxAiJeDFAdpQfXU+O7qesB/H225NJke+gMIMOMc+i6 KZIG2ZID2RtzqEkB5CJVQuyKR/zXRJ4Wo297+z1IL/N5dVoeQ3AVEbZXVW4JYA== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 08/17] dt-bindings: mtd: sunxi-nand: Add an example to validate the bindings Date: Mon, 14 Nov 2022 10:03:06 +0100 Message-Id: <20221114090315.848208-9-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 CCEB5C433FE for ; Mon, 14 Nov 2022 09:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236811AbiKNJEc (ORCPT ); Mon, 14 Nov 2022 04:04:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236783AbiKNJDp (ORCPT ); Mon, 14 Nov 2022 04:03:45 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCB371D0E0; Mon, 14 Nov 2022 01:03:44 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id B2FD0FF805; Mon, 14 Nov 2022 09:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IMd5yQHc0mg7inpTTSKlKhmW8IystLlC3mwO9N5nbf0=; b=ZUOFFzlahY/6zR8pZGIcGDlVQIV1XA+HsAoAWglps0ariGqxA2mYrg+w6at9ptJfOTq7gZ fXMmPHOnKlr+DZVvtUjbOv/X5i9aSRVwkTpaGjl2Z1bUrCgY/q/5wY3IukIxKFz5H7MViQ CupDkGaueHDRxqSLJM7bTIO35KfeRmSqJNBI7SBnmM4dETRj9ZAhdOEDnGbIP+wNnvRNWd 16qXoCZdH3PS9MU2jBBe175a7e/HfFvU6VlquHcrZor6HSLfs2cajaqSm3Y5pAFY4Ixxf3 gmrVWp5KjjG/GW2q5VGS9SAdYxirwmErogfunhcOLHlTQC7qZqlZYNcDmyk7og== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 09/17] dt-bindings: mtd: spi-nor: Drop common properties Date: Mon, 14 Nov 2022 10:03:07 +0100 Message-Id: <20221114090315.848208-10-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 1496AC4332F for ; Mon, 14 Nov 2022 09:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236892AbiKNJEj (ORCPT ); Mon, 14 Nov 2022 04:04:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236815AbiKNJDt (ORCPT ); Mon, 14 Nov 2022 04:03:49 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDB791D643; Mon, 14 Nov 2022 01:03:47 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 089E8FF814; Mon, 14 Nov 2022 09:03:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9dJEc1+k308koWh3qlEAPGOXzHpFninitXpbK03A4Gs=; b=L+e4cEYFuSXg05G3UhHC4xTMcufckNXW9ulOWm+MzLx3GWuEoahJNEXOPvO4xl6kIObLXD OLTGhK/1l8TRH6kfM+iinGQXrjsw8jvH3uV6SBEOL4xOrQEHjjyS/3Em7XLzox5YTwdXDB Fv0oUQxIgRYdZdQdEsSbsWByVu7l9KIcck7yYaQxPHA4yEMDX0B00RVwZvqO12Juvdqc84 8ipDDdQ+IaEGkjEJJOFi0EffoilgbLpMqZ4f0CA8eQkFux7JweJvrS2XGoEtr2mqjjibb9 l/oxzv5p/6UTuV6j7xd28C+UfPonkm4OJ3wqs1Ih0hpQsZcXwnaX9aS0pcdRUw== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 10/17] dt-bindings: mtd: physmap: Reuse the generic definitions Date: Mon, 14 Nov 2022 10:03:08 +0100 Message-Id: <20221114090315.848208-11-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 CF42CC433FE for ; Mon, 14 Nov 2022 09:04:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236903AbiKNJEt (ORCPT ); Mon, 14 Nov 2022 04:04:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236826AbiKNJDw (ORCPT ); Mon, 14 Nov 2022 04:03:52 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7281F55A9; Mon, 14 Nov 2022 01:03:50 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id D19E8FF804; Mon, 14 Nov 2022 09:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416628; 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=1YKZJpyyDpzLpLTerzSJVsOPfYXTPzoZL58epAf0oOA=; b=eFlckNu7ReBGeuAQdoMEvTq3NXIMYg49Pxpxyr5KZjIzIQ+7QTHmBzDnhcQ6w4B6vDkCAj Ax+3TfBMlmilH+LCZ/00U6xLBlZpEvIzHJ8ZQ9fpujf/wkUEl0DtU4KSByGkzMHet7u7qI dwRc/AhFAJdp9IRDRrDL4c3TXuBwSI0Iog5EYzQj1rRZeuVDaPAQTip9ecHKtQdtga43QT LypO9OqeNqvMizAmXov7xxBjnEzwjp0it7pej5/8LVyXciMFb5v/zUrkBli27dQJ650uiA tzYlMEaU4v3Nrk5+Ue8LRooLhECZtMnjaCePxWwC4YHH9hza5i+QVy7Et4oK8g== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 11/17] dt-bindings: mtd: partitions: Constrain the list of parsers Date: Mon, 14 Nov 2022 10:03:09 +0100 Message-Id: <20221114090315.848208-12-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-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 8EF4CC433FE for ; Mon, 14 Nov 2022 09:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236849AbiKNJEo (ORCPT ); Mon, 14 Nov 2022 04:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236842AbiKNJEB (ORCPT ); Mon, 14 Nov 2022 04:04:01 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0633F1D326; Mon, 14 Nov 2022 01:03:51 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 0E817FF80F; Mon, 14 Nov 2022 09:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2GMVpmkxCSCyo/tEv6D1Xa5VBGNeC8i1WPJ1iBZRltY=; b=fJzsUhhuFC8MDsP1W6vRcOz32ei8ILzqx3jUaDhmxIqqJurD1F8wSskxWssyT8/B3Jszxi RwRJIdI/ZYCFS+vowb7zVZJS9hGnQRQLzY7nmRYq/79dwWjYcEsCTFvav75Jk+yI7ya/jP 7Nxkc1rCW8o8SiW+gnrB3EfYlppGN6BpMrriT47vx33hM6erfQV7d8N3hpOqHpuO5NQyuN jAhR7V3V9gwRABkFwnJ1/hdmTyCHvqgtTzYB+LUHWh4sEAOiasYuXKfTn3LJph9bX3Ktjo EtvCnn5oAhFNEiYCZbIXwVAKm4nP/e+e59ux5YnbhoYnDL+CHVNAK48O1B5S9g== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 12/17] dt-bindings: mtd: partitions: Change qcom,smem-part partition type Date: Mon, 14 Nov 2022 10:03:10 +0100 Message-Id: <20221114090315.848208-13-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 A0D8DC433FE for ; Mon, 14 Nov 2022 09:04:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236752AbiKNJEy (ORCPT ); Mon, 14 Nov 2022 04:04:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236792AbiKNJEE (ORCPT ); Mon, 14 Nov 2022 04:04:04 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 544C41D66F; Mon, 14 Nov 2022 01:03:54 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id ED1F9FF802; Mon, 14 Nov 2022 09:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oZXshiOPjCKaC4DLT1nvR8gkGxfPYRfPdpLRj3Pz4+g=; b=UDSNPAslbjlapBM2Hm0s6QeHvls1ReRpUBGOmWfcNV/oylSVgoLi73PT/bpVvmqg0lTGaj UJV1JpfXA5sVSoNT5Tg7m3VXh9884AG0AVdQhKtKbWnI7fnj1LnAordS6vOtUPw5fyHOOf UrgNmD+uEoiyjDUQqDczAQJrzVsskijWHtdPH1OhDI7bNKXBYI10Q2D6nA9sWbu8d/E7ZF PV6Z2HxUdv0r7Dh3HHwklr58jb71nt3/qBTVpJATtueCYG5TfwBsiGtC2kLKb5lPJ2vyW1 uP99kh/SUBARWq1xENSI9iNltL5TUEod9jL5schJCQxY3hpKd3wbxPkPnoVJpw== 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 , , Miquel Raynal Subject: [PATCH v3 13/17] dt-bindings: mtd: nvmem-cells: Drop range property from example Date: Mon, 14 Nov 2022 10:03:11 +0100 Message-Id: <20221114090315.848208-14-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Memory mapped devices such as parallel NOR flash could make use of the 'ranges' property to translate a nvmem 'reg' cell address to a CPU address but in practice there is no upstream user nor any declaration of this property being valid in this case yet, leading to a warning when constraining a bit more the schema: .../mtd/partitions/nvmem-cells.example.dtb: calibration@f00000: Unevaluated properties are not allowed ('ranges' was unexpected) So let's drop the property from the example, knowing that someone might actually properly define it some day. 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 CEFE8C433FE for ; Mon, 14 Nov 2022 09:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236855AbiKNJE5 (ORCPT ); Mon, 14 Nov 2022 04:04:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236856AbiKNJEV (ORCPT ); Mon, 14 Nov 2022 04:04:21 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F2EC1DA5A; Mon, 14 Nov 2022 01:03:56 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 39DD3FF810; Mon, 14 Nov 2022 09:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SGgLQJiM767wl93pGV+At61F3Cl0A+eitZYipi117FY=; b=pdcgHVIjKG1D0HsuTRi8Wg5NCj25/XO1IB4F76Tg6izZ6E9L615VdI2WlPZ6h1pSeqFj1Z AQGCPIb7R3UUMXHzFYgo49rUloHBxbMiMw5Lk+bF7X5d1ETNL15xTg0oGQ5GVd+x+51KYE cJPSTFemhrwXnYFc3YS6rjHnl87dzjex4HKePGD5hKaOfNmf9etJoCId6QXWQN9qSahk0l v9mNb5LZbdt3tAi78R9kwTpxap8//+jb93So5CKT/esHM2An7Y2DSXE+cF0j+R3Xz2jcr/ +X1XtshAmLSDhx7Xc6ybCMYeGPH22Vtrn4SbE4YgJ2D4XWHC8eIVEabFayN/8A== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 14/17] dt-bindings: mtd: nvmem-cells: Inherit from MTD partitions Date: Mon, 14 Nov 2022 10:03:12 +0100 Message-Id: <20221114090315.848208-15-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 C0334C433FE for ; Mon, 14 Nov 2022 09:05:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236739AbiKNJFQ (ORCPT ); Mon, 14 Nov 2022 04:05:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236873AbiKNJE0 (ORCPT ); Mon, 14 Nov 2022 04:04:26 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA4721DDD5; Mon, 14 Nov 2022 01:03:59 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 15A47FF80A; Mon, 14 Nov 2022 09:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I4XXOMBEfkOnV0QqjTL56rdfmw5ub9qZ5YqwWMsqScM=; b=PyF8XpzkEOT588yhvLs5BREzHcO14FndTUUNfuU1EVSDQIma8+TH5yYBkK3Spl1OahmPln RqJ8dqzyUUYgJic6TcjT/UistfhpCZvHl0H5vpb1PyLam2BPka+Jo5biGKqD3M3+/PbTuS 6b6aN5d6vfJ2X1xAnwKAVyRVxO8fHdtBxUzMDCDqD2VKWdeV2P0Q7z7knDfS2b3wyai6m3 +Ng54sox6PA/Q0tfZsZRhJYwHlE9dkcDoIqMXK8fNeC773/IzJam+1s9e+15KpM29gHQs0 JsEkZgvP96xsLkK+U9ZpC9DSt0cdUYpPVflm9P+2qQqOmiPzD1HSicbT+W3MbQ== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 15/17] dt-bindings: mtd: Argue in favor of keeping additionalProperties set to true Date: Mon, 14 Nov 2022 10:03:13 +0100 Message-Id: <20221114090315.848208-16-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 5697CC433FE for ; Mon, 14 Nov 2022 09:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236915AbiKNJFV (ORCPT ); Mon, 14 Nov 2022 04:05:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236783AbiKNJEd (ORCPT ); Mon, 14 Nov 2022 04:04:33 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BC071DDE8; Mon, 14 Nov 2022 01:04:00 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id E3ABAFF815; Mon, 14 Nov 2022 09:03:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p+yDyoG2qKYEY8YhhZqOq33UNeQMIcC6DN9z91vnmHU=; b=LQh96YYntByQyxcKe0JCkWkS0OBc9b4DSahCT3qaQVd4HHXBCF5JEigiffOB1NdU7CKNQE B2KsJZGfIfN64kE6pRicJdFc80adinWRe8rA9qOvcgb5BIN5zpmzCln1CPOPwlHTfx8ftN lhpTbjbNfTD/FbbIzjM5I7IFnFfEyfKpcpFhqeB6acxVAoZVpkKnUV8hvWchYdk/XPrTzV +Lz1vNcZN64sRFDknCQwl6u/L465ERep2a4NU4RHTffkMh7JSb6bPX9tf4rDy9gm9Uqm9L YdAlmnMpSSS8PINpLmw31Kuv22Pi7+4qVpHsfVdiK/m0MUDRkoMwPvefKiY9QA== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 16/17] dt-bindings: mtd: Drop object types when referencing other files Date: Mon, 14 Nov 2022 10:03:14 +0100 Message-Id: <20221114090315.848208-17-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 1C656C4332F for ; Mon, 14 Nov 2022 09:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236906AbiKNJFZ (ORCPT ); Mon, 14 Nov 2022 04:05:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236884AbiKNJEg (ORCPT ); Mon, 14 Nov 2022 04:04:36 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 173E31DDF5; Mon, 14 Nov 2022 01:04:02 -0800 (PST) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 84612FF807; Mon, 14 Nov 2022 09:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1668416641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yQNs0M4Xzz0WILbFL64Nb+tMa70EBXuhVGNlkcUmbc0=; b=AyBh/MjYiyCpK1+QOwtS/fxuMfB1eH6PdeOGqOkivZhTWvNTsYyIweNy1BpaYM/V9BIJ9q TUpH/gWpnF7FR/o2x39+JnSoiI2qd/jfCg47HpmsAV8ML+UV4sOtOx8Qil7q1qxUwbgDll QkyPK3h3ARyMzJG8T7b5fq/iQJWYjGLy8omH09n1cUqJpmQVU00PNNnnCc9NLTckFGLSuC vG7AWBKNRfJGaaHPsQLy3B2XSdpww7mRS+XqVb90mBtx8jG7WpkKV04Zds4vzWOZ7JUOiS qd8MBZ/ktrMj7+PjMTeXKVSngdtQaSojHRGzZzMpPqcHo3NGRJa47eCyB0+ViA== 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 , , Miquel Raynal , Rob Herring Subject: [PATCH v3 17/17] dt-bindings: mtd: Standardize the style in the examples Date: Mon, 14 Nov 2022 10:03:15 +0100 Message-Id: <20221114090315.848208-18-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090315.848208-1-miquel.raynal@bootlin.com> References: <20221114090315.848208-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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