Skip to content

Commit 1b49e36

Browse files
committed
Merge tag 'mtd/for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD updates from Miquel Raynal: "MTD: - prioritize ofpart in physmap-core probing - conversions to scoped for each OF child loops Bindings: - The bulk of the changes consists of binding fixes/updates to restrict the use of undefined properties, which was mostly ineffective in the current form because of the nesting of partition nodes and the lack of compatible strings - YAML conversions and the addition of a dma-coherent property in the cdns,hp-nfc driver SPI NAND: - support for octal DTR modes (8D-8D-8D) - support for Foresee F35SQB002G chips And small misc fixes" * tag 'mtd/for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (65 commits) mtd: spi-nor: hisi-sfc: fix refcounting bug in hisi_spi_nor_register_all() mtd: spinand: fix NULL pointer dereference in spinand_support_vendor_ops() mtd: rawnand: pl353: Add message about ECC mode mtd: rawnand: pl353: Fix software ECC support mtd: spinand: winbond: Remove unneeded semicolon dt-bindings: mtd: cdns,hp-nfc: Add dma-coherent property mtd: spinand: Disable continuous read during probe mtd: spinand: add Foresee F35SQB002G flash support mtd: spinand: winbond: W35N octal DTR support mtd: spinand: Add octal DTR support mtd: spinand: Warn if using SSDR-only vendor commands in a non SSDR mode mtd: spinand: Give the bus interface to the configuration helper mtd: spinand: Propagate the bus interface across core helpers mtd: spinand: Add support for setting a bus interface mtd: spinand: Gather all the bus interface steps in one single function mtd: spinand: winbond: Configure the IO mode after the dummy cycles mtd: spinand: winbond: Rename IO_MODE register macro mtd: spinand: winbond: Fix style mtd: spinand: winbond: Register W35N vendor specific operation mtd: spinand: winbond: Register W25N vendor specific operation ...
2 parents 72f0500 + 7e96d76 commit 1b49e36

60 files changed

Lines changed: 1292 additions & 608 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/mmc/mmc-card.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,13 @@ properties:
3232

3333
patternProperties:
3434
"^partitions(-boot[12]|-gp[14])?$":
35-
$ref: /schemas/mtd/partitions/partitions.yaml
35+
type: object
36+
additionalProperties: true
3637

37-
patternProperties:
38-
"^partition@[0-9a-f]+$":
39-
$ref: /schemas/mtd/partitions/partition.yaml
40-
41-
properties:
42-
reg:
43-
description: Must be multiple of 512 as it's converted
44-
internally from bytes to SECTOR_SIZE (512 bytes)
45-
46-
required:
47-
- reg
48-
49-
unevaluatedProperties: false
38+
properties:
39+
compatible:
40+
contains:
41+
const: fixed-partitions
5042

5143
required:
5244
- compatible

Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ properties:
6666
items:
6767
- const: brcm,nand-iproc
6868
- const: brcm,brcmnand-v6.1
69-
- const: brcm,brcmnand
7069
- description: BCM63168 SoC-specific NAND controller
7170
items:
7271
- const: brcm,nand-bcm63168

Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ properties:
4040
dmas:
4141
maxItems: 1
4242

43+
dma-coherent: true
44+
4345
iommus:
4446
maxItems: 1
4547

Documentation/devicetree/bindings/mtd/microchip,mchp23k256.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mtd/microchip,mchp23k256.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip 23K256 SPI SRAM
8+
9+
maintainers:
10+
- Richard Weinberger <richard@nod.at>
11+
12+
description:
13+
The Microchip 23K256 is a 256 Kbit (32 Kbyte) serial SRAM with an
14+
SPI interface,supporting clock frequencies up to 20 MHz. It features
15+
a 32-byte page size for writes and supports byte, page, and
16+
sequential access modes.
17+
18+
allOf:
19+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- microchip,mchp23k256
25+
- microchip,mchp23lcv1024
26+
27+
reg:
28+
maxItems: 1
29+
30+
required:
31+
- reg
32+
- compatible
33+
- spi-max-frequency
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
spi {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
sram@0 {
44+
compatible = "microchip,mchp23k256";
45+
reg = <0>;
46+
spi-max-frequency = <20000000>;
47+
};
48+
};
49+
...

Documentation/devicetree/bindings/mtd/mtd.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@ properties:
3030
deprecated: true
3131

3232
partitions:
33-
$ref: /schemas/mtd/partitions/partitions.yaml
33+
type: object
3434

3535
required:
3636
- compatible
3737

3838
patternProperties:
39-
"@[0-9a-f]+$":
40-
$ref: partitions/partition.yaml
41-
deprecated: true
42-
43-
"^partition@[0-9a-f]+":
44-
$ref: partitions/partition.yaml
39+
"(^partition)?@[0-9a-f]+$":
40+
$ref: /schemas/mtd/partitions/partition.yaml#/$defs/partition-node
4541
deprecated: true
4642

4743
"^otp(-[0-9]+)?$":
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/mtd/mxic,multi-itfc-v009-nand-controller.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Macronix Raw NAND Controller
9+
10+
maintainers:
11+
- Mason Yang <masonccyang@mxic.com.tw>
12+
13+
description:
14+
The Macronix Multi-Interface Raw NAND Controller is a versatile flash
15+
memory controller for embedding in SoCs, capable of interfacing with
16+
various NAND devices. It requires dedicated clock inputs for core, data
17+
transmit, and delayed transmit paths along with register space and an
18+
interrupt line for operation.
19+
20+
allOf:
21+
- $ref: nand-controller.yaml#
22+
23+
properties:
24+
compatible:
25+
const: mxic,multi-itfc-v009-nand-controller
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
"#address-cells":
34+
const: 1
35+
36+
"#size-cells":
37+
const: 0
38+
39+
clocks:
40+
minItems: 3
41+
maxItems: 3
42+
43+
clock-names:
44+
items:
45+
- const: ps
46+
- const: send
47+
- const: send_dly
48+
49+
required:
50+
- compatible
51+
- reg
52+
- interrupts
53+
- "#address-cells"
54+
- "#size-cells"
55+
- clocks
56+
- clock-names
57+
58+
unevaluatedProperties: false
59+
60+
examples:
61+
- |
62+
#include <dt-bindings/interrupt-controller/arm-gic.h>
63+
nand-controller@43c30000 {
64+
compatible = "mxic,multi-itfc-v009-nand-controller";
65+
reg = <0x43c30000 0x10000>;
66+
#address-cells = <1>;
67+
#size-cells = <0>;
68+
interrupts = <GIC_SPI 0x1d IRQ_TYPE_EDGE_RISING>;
69+
clocks = <&clkwizard 0>, <&clkwizard 1>, <&clkc 15>;
70+
clock-names = "ps", "send", "send_dly";
71+
72+
nand@0 {
73+
reg = <0>;
74+
nand-ecc-mode = "soft";
75+
nand-ecc-algo = "bch";
76+
};
77+
};
78+
...

Documentation/devicetree/bindings/mtd/mxic-nand.txt

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

Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ title: ARM Firmware Suite (AFS) Partitions
99
maintainers:
1010
- Linus Walleij <linusw@kernel.org>
1111

12-
select: false
13-
1412
description: |
1513
The ARM Firmware Suite is a flash partitioning system found on the
1614
ARM reference designs: Integrator AP, Integrator CP, Versatile AB,

Documentation/devicetree/bindings/mtd/partitions/binman.yaml

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

0 commit comments

Comments
 (0)