Skip to content

Commit 08de7f9

Browse files
committed
Merge tag 'mtd/for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD updates from Miquel Raynal: "MTD changes: - There's been no major core change, just a bunch of driver related improvements. Amongst them the conversion to of_property_present() for non-boolean properties, the addition of the support for Fujitsu MB85RS128TY FRAM, a couple of improvements to the phram driver and the usual load of misc changes. Raw NAND changes: - A new controller driver, from Nuvoton, has been merged - Bastien Curutchet has contributed a series improving the Davinci controller driver, both on the organization of the code, but also on the performance side. The binding has also been converted to yaml, received a new OOB layout and now supports on-die ECC engines - The Qualcomm controller driver has been deeply cleaned to extract some parts of the code into a shared file with the Qualcomm SPI memory controller - Aside from these main changes, the Cadence binding has been converted to yaml, the brcmnand controller driver has received a small fix, otherwise some more minor changes have also made their way in SPI NAND changes: - The SPI NAND subsystem has seen a great improvement, with the advent of DTR operations (DDR operations, which may be extended to the address cycles). The first vendor driver to benefit from these improvements is the Winbond driver - A new manufacturer driver is added SkyHigh, with a new constraint for the core, it is impossible to disable the on-die ECC engine - A Foresee device is also now supported SPI NOR changes: - Several flash entries have been added: Atmel AT25SF321, Spansion S28HL256T and S28HL02GT - Support for vcc-supply regulators and their DT bindings has been added - The mx25u25635f entry has been dropped. The flash shares its ID with mx25u25645g and both parts have an SFDP table. Removing their entry lets them be driven by the generic SFDP-based driver" * tag 'mtd/for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (47 commits) mtd: spinand: skyhigh: Align with recent read from cache variant changes mtd: spinand: winbond: Add support for DTR operations mtd: spinand: winbond: Add comment about naming mtd: spinand: winbond: Update the *JW chip definitions mtd: spinand: Add support for read DTR operations mtd: spinand: Enhance the logic when picking a variant mtd: spinand: Add an optional frequency to read from cache macros mtd: spinand: Create distinct fast and slow read from cache variants mtd: hyperbus: Use of_property_present() for non-boolean properties mtd: st_spi_fsm: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() mtd: rawnand: davinci: add ROM supported OOB layout mtd: spi-nor: sysfs: constify 'struct bin_attribute' mtd: spi-nor: spansion: Add support for S28HL02GT mtd: spi-nor: spansion: Add support for S28HL256T mtd: spi-nor: extend description of size member of struct flash_info mtd: rawnand: davinci: Reduce polling interval in NAND_OP_WAITRDY_INSTR mtd: rawnand: qcom: Fix build issue on x86 architecture mtd: rawnand: qcom: use FIELD_PREP and GENMASK mtd: nand: Add qpic_common API file mtd: rawnand: qcom: Add qcom prefix to common api ...
2 parents 647d696 + 0ddeb4f commit 08de7f9

Some content is hidden

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

43 files changed

+3428
-1683
lines changed

Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt

Lines changed: 0 additions & 53 deletions
This file was deleted.
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mtd/cdns,hp-nfc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cadence NAND controller
8+
9+
maintainers:
10+
- Niravkumar L Rabara <[email protected]>
11+
12+
allOf:
13+
- $ref: nand-controller.yaml
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: cdns,hp-nfc
19+
20+
reg:
21+
items:
22+
- description: Controller register set
23+
- description: Slave DMA data port register set
24+
25+
reg-names:
26+
items:
27+
- const: reg
28+
- const: sdma
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
clocks:
34+
maxItems: 1
35+
36+
dmas:
37+
maxItems: 1
38+
39+
cdns,board-delay-ps:
40+
description: |
41+
Estimated Board delay. The value includes the total round trip
42+
delay for the signals and is used for deciding on values associated
43+
with data read capture. The example formula for SDR mode is the
44+
following.
45+
board delay = RE#PAD delay + PCB trace to device + PCB trace from device
46+
+ DQ PAD delay
47+
48+
required:
49+
- compatible
50+
- reg
51+
- reg-names
52+
- interrupts
53+
- clocks
54+
55+
unevaluatedProperties: false
56+
57+
examples:
58+
- |
59+
#include <dt-bindings/interrupt-controller/arm-gic.h>
60+
61+
nand-controller@10b80000 {
62+
compatible = "cdns,hp-nfc";
63+
reg = <0x10b80000 0x10000>,
64+
<0x10840000 0x10000>;
65+
reg-names = "reg", "sdma";
66+
#address-cells = <1>;
67+
#size-cells = <0>;
68+
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
69+
clocks = <&nf_clk>;
70+
cdns,board-delay-ps = <4830>;
71+
72+
nand@0 {
73+
reg = <0>;
74+
};
75+
};

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

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

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ properties:
9696
If "broken-flash-reset" is present then having this property does not
9797
make any difference.
9898

99+
vcc-supply:
100+
description:
101+
Supply for the SPI NOR power.
102+
99103
spi-cpol: true
100104
spi-cpha: true
101105

Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ description: |
1616
1717
properties:
1818
compatible:
19-
items:
20-
- const: microchip,48l640
19+
enum:
20+
- fujitsu,mb85rs128ty
21+
- microchip,48l640
2122

2223
reg:
2324
maxItems: 1
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mtd/nuvoton,ma35d1-nand.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Nuvoton MA35D1 NAND Flash Interface (NFI) Controller
8+
9+
maintainers:
10+
- Hui-Ping Chen <[email protected]>
11+
12+
allOf:
13+
- $ref: nand-controller.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- nuvoton,ma35d1-nand-controller
19+
20+
reg:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
patternProperties:
30+
"^nand@[a-f0-9]$":
31+
type: object
32+
$ref: raw-nand-chip.yaml
33+
properties:
34+
reg:
35+
minimum: 0
36+
maximum: 1
37+
38+
nand-ecc-step-size:
39+
enum: [512, 1024]
40+
41+
nand-ecc-strength:
42+
enum: [8, 12, 24]
43+
44+
required:
45+
- reg
46+
47+
unevaluatedProperties: false
48+
49+
required:
50+
- compatible
51+
- reg
52+
- interrupts
53+
- clocks
54+
55+
unevaluatedProperties: false
56+
57+
examples:
58+
- |
59+
#include <dt-bindings/interrupt-controller/arm-gic.h>
60+
#include <dt-bindings/clock/nuvoton,ma35d1-clk.h>
61+
62+
soc {
63+
#address-cells = <2>;
64+
#size-cells = <2>;
65+
66+
nand-controller@401A0000 {
67+
compatible = "nuvoton,ma35d1-nand-controller";
68+
reg = <0x0 0x401A0000 0x0 0x1000>;
69+
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
70+
clocks = <&clk NAND_GATE>;
71+
#address-cells = <1>;
72+
#size-cells = <0>;
73+
74+
nand@0 {
75+
reg = <0>;
76+
nand-on-flash-bbt;
77+
nand-ecc-step-size = <512>;
78+
nand-ecc-strength = <8>;
79+
80+
partitions {
81+
compatible = "fixed-partitions";
82+
#address-cells = <1>;
83+
#size-cells = <1>;
84+
85+
uboot@0 {
86+
label = "nand-uboot";
87+
read-only;
88+
reg = <0x0 0x300000>;
89+
};
90+
};
91+
};
92+
};
93+
};
94+
95+
...

0 commit comments

Comments
 (0)