Skip to content

Commit 438356e

Browse files
montjoiemiquelraynal
authored andcommitted
dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt
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 a10d862 ("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> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20220211120842.3388592-1-clabbe@baylibre.com
1 parent ccb7bc5 commit 438356e

2 files changed

Lines changed: 17 additions & 25 deletions

File tree

Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.

Documentation/devicetree/bindings/mtd/mtd-physmap.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ properties:
4444
- numonyx,js28f128
4545
- sst,sst39vf320
4646
- xlnx,xps-mch-emc-2.00.a
47-
- const: cfi-flash
47+
- enum:
48+
- cfi-flash
49+
- jedec-flash
4850
- items:
4951
- enum:
5052
- cypress,cy7c1019dv33-10zsxi
@@ -127,6 +129,20 @@ required:
127129
- compatible
128130
- reg
129131

132+
if:
133+
properties:
134+
compatible:
135+
contains:
136+
const: cortina,gemini-flash
137+
then:
138+
properties:
139+
syscon:
140+
$ref: /schemas/types.yaml#/definitions/phandle
141+
description:
142+
Phandle to the syscon controller
143+
required:
144+
- syscon
145+
130146
# FIXME: A parent bus may define timing properties
131147
additionalProperties: true
132148

0 commit comments

Comments
 (0)