* [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt
@ 2022-02-11 12:08 Corentin Labbe
2022-02-15 15:22 ` Rob Herring
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Corentin Labbe @ 2022-02-11 12:08 UTC (permalink / raw)
To: krzysztof.kozlowski, linus.walleij, miquel.raynal, richard,
robh+dt, vigneshr
Cc: devicetree, linux-arm-kernel, linux-kernel, linux-mtd, Corentin Labbe
Drop mtd/cortina,gemini-flash.txt since it is nearly already handled by
Documentation/devicetree/bindings/mtd/mtd-physmap.yaml.
We add jedec-flash to list of compatible because one board (gemini-dlink-dns-313.dts) needs it.
See commit a10d862e585e ("ARM: dts: Fix the DNS-313 flash compatible")
The flash on the DNS-313 needs to be probed as JEDEC, it does not conform to the common CFI standard.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
Change since v1
- fixed typo in syscon
Change since v2
- Added reason of adding jedec-flash
.../bindings/mtd/cortina,gemini-flash.txt | 24 -------------------
.../devicetree/bindings/mtd/mtd-physmap.yaml | 18 +++++++++++++-
2 files changed, 17 insertions(+), 25 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt
diff --git a/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt b/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt
deleted file mode 100644
index efa5b2aba829..000000000000
--- a/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Flash device on Cortina Systems Gemini SoC
-
-This flash is regular CFI compatible (Intel or AMD extended) flash chips with
-some special bits that can be controlled by the machine's system controller.
-
-Required properties:
-- compatible : must be "cortina,gemini-flash", "cfi-flash";
-- reg : memory address for the flash chip
-- syscon : must be a phandle to the system controller
-- bank-width : width in bytes of flash interface, should be <2>
-
-For the rest of the properties, see mtd-physmap.yaml.
-
-The device tree may optionally contain sub-nodes describing partitions of the
-address space. See partition.txt for more detail.
-
-Example:
-
-flash@30000000 {
- compatible = "cortina,gemini-flash", "cfi-flash";
- reg = <0x30000000 0x01000000>;
- syscon = <&syscon>;
- bank-width = <2>;
-};
diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml b/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
index f827984936f6..82eb4e0f453b 100644
--- a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
+++ b/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
@@ -44,7 +44,9 @@ properties:
- numonyx,js28f128
- sst,sst39vf320
- xlnx,xps-mch-emc-2.00.a
- - const: cfi-flash
+ - enum:
+ - cfi-flash
+ - jedec-flash
- items:
- enum:
- cypress,cy7c1019dv33-10zsxi
@@ -127,6 +129,20 @@ required:
- compatible
- reg
+if:
+ properties:
+ compatible:
+ contains:
+ const: cortina,gemini-flash
+then:
+ properties:
+ syscon:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to the syscon controller
+ required:
+ - syscon
+
# FIXME: A parent bus may define timing properties
additionalProperties: true
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt
2022-02-11 12:08 [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt Corentin Labbe
@ 2022-02-15 15:22 ` Rob Herring
2022-02-17 23:37 ` Rob Herring
2022-02-18 14:32 ` Miquel Raynal
2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2022-02-15 15:22 UTC (permalink / raw)
To: Corentin Labbe
Cc: linus.walleij, richard, linux-arm-kernel, linux-mtd,
linux-kernel, krzysztof.kozlowski, miquel.raynal, vigneshr,
devicetree, robh+dt
On Fri, 11 Feb 2022 12:08:42 +0000, Corentin Labbe wrote:
> Drop mtd/cortina,gemini-flash.txt since it is nearly already handled by
> Documentation/devicetree/bindings/mtd/mtd-physmap.yaml.
>
> We add jedec-flash to list of compatible because one board (gemini-dlink-dns-313.dts) needs it.
> See commit a10d862e585e ("ARM: dts: Fix the DNS-313 flash compatible")
> The flash on the DNS-313 needs to be probed as JEDEC, it does not conform to the common CFI standard.
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> Change since v1
> - fixed typo in syscon
>
> Change since v2
> - Added reason of adding jedec-flash
>
> .../bindings/mtd/cortina,gemini-flash.txt | 24 -------------------
> .../devicetree/bindings/mtd/mtd-physmap.yaml | 18 +++++++++++++-
> 2 files changed, 17 insertions(+), 25 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt
>
Running 'make dtbs_check' with the schema in this patch gives the
following warnings. Consider if they are expected or the schema is
incorrect. These may not be new warnings.
Note that it is not yet a requirement to have 0 warnings for dtbs_check.
This will change in the future.
Full log is available here: https://patchwork.ozlabs.org/patch/1591614
flash@0: compatible: 'oneOf' conditional failed, one must be fixed:
arch/arm/boot/dts/r8a73a4-ape6evm.dt.yaml
nor@20000000: compatible: 'oneOf' conditional failed, one must be fixed:
arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dt.yaml
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt
2022-02-11 12:08 [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt Corentin Labbe
2022-02-15 15:22 ` Rob Herring
@ 2022-02-17 23:37 ` Rob Herring
2022-02-18 14:32 ` Miquel Raynal
2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2022-02-17 23:37 UTC (permalink / raw)
To: Corentin Labbe
Cc: robh+dt, linux-kernel, devicetree, krzysztof.kozlowski, richard,
linux-mtd, linus.walleij, vigneshr, linux-arm-kernel,
miquel.raynal
On Fri, 11 Feb 2022 12:08:42 +0000, Corentin Labbe wrote:
> Drop mtd/cortina,gemini-flash.txt since it is nearly already handled by
> Documentation/devicetree/bindings/mtd/mtd-physmap.yaml.
>
> We add jedec-flash to list of compatible because one board (gemini-dlink-dns-313.dts) needs it.
> See commit a10d862e585e ("ARM: dts: Fix the DNS-313 flash compatible")
> The flash on the DNS-313 needs to be probed as JEDEC, it does not conform to the common CFI standard.
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> Change since v1
> - fixed typo in syscon
>
> Change since v2
> - Added reason of adding jedec-flash
>
> .../bindings/mtd/cortina,gemini-flash.txt | 24 -------------------
> .../devicetree/bindings/mtd/mtd-physmap.yaml | 18 +++++++++++++-
> 2 files changed, 17 insertions(+), 25 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt
2022-02-11 12:08 [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt Corentin Labbe
2022-02-15 15:22 ` Rob Herring
2022-02-17 23:37 ` Rob Herring
@ 2022-02-18 14:32 ` Miquel Raynal
2 siblings, 0 replies; 4+ messages in thread
From: Miquel Raynal @ 2022-02-18 14:32 UTC (permalink / raw)
To: Corentin Labbe, krzysztof.kozlowski, linus.walleij,
miquel.raynal, richard, robh+dt, vigneshr
Cc: devicetree, linux-arm-kernel, linux-kernel, linux-mtd
On Fri, 2022-02-11 at 12:08:42 UTC, Corentin Labbe wrote:
> Drop mtd/cortina,gemini-flash.txt since it is nearly already handled by
> Documentation/devicetree/bindings/mtd/mtd-physmap.yaml.
>
> We add jedec-flash to list of compatible because one board (gemini-dlink-dns-313.dts) needs it.
> See commit a10d862e585e ("ARM: dts: Fix the DNS-313 flash compatible")
> The flash on the DNS-313 needs to be probed as JEDEC, it does not conform to the common CFI standard.
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
Miquel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-18 14:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-11 12:08 [PATCH v3] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt Corentin Labbe
2022-02-15 15:22 ` Rob Herring
2022-02-17 23:37 ` Rob Herring
2022-02-18 14:32 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).