Convert the Denali NAND controller binding to DT schema format.
Signed-off-by: Masahiro Yamada <[email protected]>
---
.../devicetree/bindings/mtd/denali,nand.yaml | 149 ++++++++++++++++++
.../devicetree/bindings/mtd/denali-nand.txt | 61 -------
2 files changed, 149 insertions(+), 61 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mtd/denali,nand.yaml
delete mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
diff --git a/Documentation/devicetree/bindings/mtd/denali,nand.yaml b/Documentation/devicetree/bindings/mtd/denali,nand.yaml
new file mode 100644
index 000000000000..b41b7e4bfe78
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/denali,nand.yaml
@@ -0,0 +1,149 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mtd/denali,nand.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Denali NAND controller
+
+maintainers:
+ - Masahiro Yamada <[email protected]>
+
+properties:
+ compatible:
+ description: version 2.91, 3.1, 3.1.1, respectively
+ enum:
+ - altr,socfpga-denali-nand
+ - socionext,uniphier-denali-nand-v5a
+ - socionext,uniphier-denali-nand-v5b
+
+ reg-names:
+ description: |
+ There are two register regions:
+ nand_data: host data/command interface
+ denali_reg: register interface
+ items:
+ - const: nand_data
+ - const: denali_reg
+
+ reg:
+ minItems: 2
+ maxItems: 2
+
+ interrupts:
+ maxItems: 1
+
+ clock-names:
+ description: |
+ There are three clocks:
+ nand: controller core clock
+ nand_x: bus interface clock
+ ecc: ECC circuit clock
+ items:
+ - const: nand
+ - const: nand_x
+ - const: ecc
+
+ clocks:
+ minItems: 3
+ maxItems: 3
+
+ reset-names:
+ description: |
+ There are two optional resets:
+ nand: controller core reset
+ reg: register reset
+ oneOf:
+ - items:
+ - const: nand
+ - const: reg
+ - const: nand
+ - const: reg
+
+ resets:
+ minItems: 1
+ maxItems: 2
+
+allOf:
+ - $ref: nand-controller.yaml
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: altr,socfpga-denali-nand
+ then:
+ patternProperties:
+ "^nand@[a-f0-9]$":
+ type: object
+ properties:
+ nand-ecc-strength:
+ enum:
+ - 8
+ - 15
+ nand-ecc-step-size:
+ enum:
+ - 512
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-denali-nand-v5a
+ then:
+ patternProperties:
+ "^nand@[a-f0-9]$":
+ type: object
+ properties:
+ nand-ecc-strength:
+ enum:
+ - 8
+ - 16
+ - 24
+ nand-ecc-step-size:
+ enum:
+ - 1024
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-denali-nand-v5b
+ then:
+ patternProperties:
+ "^nand@[a-f0-9]$":
+ type: object
+ properties:
+ nand-ecc-strength:
+ enum:
+ - 8
+ - 16
+ nand-ecc-step-size:
+ enum:
+ - 1024
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clock-names
+ - clocks
+
+examples:
+ - |
+ nand-controller@ff900000 {
+ compatible = "altr,socfpga-denali-nand";
+ reg-names = "nand_data", "denali_reg";
+ reg = <0xff900000 0x20>, <0xffb80000 0x1000>;
+ interrupts = <0 144 4>;
+ clock-names = "nand", "nand_x", "ecc";
+ clocks = <&nand_clk>, <&nand_x_clk>, <&nand_ecc_clk>;
+ reset-names = "nand", "reg";
+ resets = <&nand_rst>, <&nand_reg_rst>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ nand@0 {
+ reg = <0>;
+ };
+ };
diff --git a/Documentation/devicetree/bindings/mtd/denali-nand.txt b/Documentation/devicetree/bindings/mtd/denali-nand.txt
deleted file mode 100644
index 98916a84bbf6..000000000000
--- a/Documentation/devicetree/bindings/mtd/denali-nand.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-* Denali NAND controller
-
-Required properties:
- - compatible : should be one of the following:
- "altr,socfpga-denali-nand" - for Altera SOCFPGA
- "socionext,uniphier-denali-nand-v5a" - for Socionext UniPhier (v5a)
- "socionext,uniphier-denali-nand-v5b" - for Socionext UniPhier (v5b)
- - reg : should contain registers location and length for data and reg.
- - reg-names: Should contain the reg names "nand_data" and "denali_reg"
- - #address-cells: should be 1. The cell encodes the chip select connection.
- - #size-cells : should be 0.
- - interrupts : The interrupt number.
- - clocks: should contain phandle of the controller core clock, the bus
- interface clock, and the ECC circuit clock.
- - clock-names: should contain "nand", "nand_x", "ecc"
-
-Optional properties:
- - resets: may contain phandles to the controller core reset, the register
- reset
- - reset-names: may contain "nand", "reg"
-
-Sub-nodes:
- Sub-nodes represent available NAND chips.
-
- Required properties:
- - reg: should contain the bank ID of the controller to which each chip
- select is connected.
-
- Optional properties:
- - nand-ecc-step-size: see nand-controller.yaml for details.
- If present, the value must be
- 512 for "altr,socfpga-denali-nand"
- 1024 for "socionext,uniphier-denali-nand-v5a"
- 1024 for "socionext,uniphier-denali-nand-v5b"
- - nand-ecc-strength: see nand-controller.yaml for details. Valid values are:
- 8, 15 for "altr,socfpga-denali-nand"
- 8, 16, 24 for "socionext,uniphier-denali-nand-v5a"
- 8, 16 for "socionext,uniphier-denali-nand-v5b"
- - nand-ecc-maximize: see nand-controller.yaml for details
-
-The chip nodes may optionally contain sub-nodes describing partitions of the
-address space. See partition.txt for more detail.
-
-Examples:
-
-nand: nand@ff900000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "altr,socfpga-denali-nand";
- reg = <0xff900000 0x20>, <0xffb80000 0x1000>;
- reg-names = "nand_data", "denali_reg";
- clocks = <&nand_clk>, <&nand_x_clk>, <&nand_ecc_clk>;
- clock-names = "nand", "nand_x", "ecc";
- resets = <&nand_rst>, <&nand_reg_rst>;
- reset-names = "nand", "reg";
- interrupts = <0 144 4>;
-
- nand@0 {
- reg = <0>;
- }
-};
--
2.17.1
On Sat, 22 Feb 2020 23:19:26 +0900, Masahiro Yamada wrote:
> Convert the Denali NAND controller binding to DT schema format.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> .../devicetree/bindings/mtd/denali,nand.yaml | 149 ++++++++++++++++++
> .../devicetree/bindings/mtd/denali-nand.txt | 61 -------
> 2 files changed, 149 insertions(+), 61 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mtd/denali,nand.yaml
> delete mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
>
Applied, thanks.
Rob
Hi Rob,
This was applied, but I just noticed one stupid mistake.
On Sat, Feb 22, 2020 at 11:20 PM Masahiro Yamada
<[email protected]> wrote:
>
> Convert the Denali NAND controller binding to DT schema format.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> .../devicetree/bindings/mtd/denali,nand.yaml | 149 ++++++++++++++++++
> .../devicetree/bindings/mtd/denali-nand.txt | 61 -------
> 2 files changed, 149 insertions(+), 61 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mtd/denali,nand.yaml
> delete mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
>
> diff --git a/Documentation/devicetree/bindings/mtd/denali,nand.yaml b/Documentation/devicetree/bindings/mtd/denali,nand.yaml
> new file mode 100644
> index 000000000000..b41b7e4bfe78
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mtd/denali,nand.yaml
> @@ -0,0 +1,149 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mtd/denali,nand.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Denali NAND controller
> +
> +maintainers:
> + - Masahiro Yamada <[email protected]>
> +
> +properties:
> + compatible:
> + description: version 2.91, 3.1, 3.1.1, respectively
Please delete this description.
This is a copy-paste mistake, which
came from my other patch
"dt-bindings: mmc: Convert UniPhier SD controller to json-schema"
> + enum:
> + - altr,socfpga-denali-nand
> + - socionext,uniphier-denali-nand-v5a
> + - socionext,uniphier-denali-nand-v5b
> +
--
Best Regards
Masahiro Yamada
On Wed, Feb 26, 2020 at 7:59 PM Masahiro Yamada
<[email protected]> wrote:
>
> Hi Rob,
>
>
> This was applied, but I just noticed one stupid mistake.
>
>
>
> On Sat, Feb 22, 2020 at 11:20 PM Masahiro Yamada
> <[email protected]> wrote:
> >
> > Convert the Denali NAND controller binding to DT schema format.
> >
> > Signed-off-by: Masahiro Yamada <[email protected]>
> > ---
> >
> > .../devicetree/bindings/mtd/denali,nand.yaml | 149 ++++++++++++++++++
> > .../devicetree/bindings/mtd/denali-nand.txt | 61 -------
> > 2 files changed, 149 insertions(+), 61 deletions(-)
> > create mode 100644 Documentation/devicetree/bindings/mtd/denali,nand.yaml
> > delete mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
> >
> > diff --git a/Documentation/devicetree/bindings/mtd/denali,nand.yaml b/Documentation/devicetree/bindings/mtd/denali,nand.yaml
> > new file mode 100644
> > index 000000000000..b41b7e4bfe78
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/mtd/denali,nand.yaml
> > @@ -0,0 +1,149 @@
> > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/mtd/denali,nand.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Denali NAND controller
> > +
> > +maintainers:
> > + - Masahiro Yamada <[email protected]>
> > +
> > +properties:
> > + compatible:
> > + description: version 2.91, 3.1, 3.1.1, respectively
>
>
> Please delete this description.
>
> This is a copy-paste mistake, which
> came from my other patch
> "dt-bindings: mmc: Convert UniPhier SD controller to json-schema"
Done.
Rob