diff options
| author | Tom Rini <[email protected]> | 2025-01-26 16:17:48 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-01-26 16:19:33 -0600 |
| commit | d8a7100d658eb201fa0e955667fdff298db31945 (patch) | |
| tree | 90447acc915dafdd9227d24f748b5f1a3976b9d3 /dts/upstream/Bindings/memory-controllers | |
| parent | 2348dd8e41ea7912f2ecf35684bbe6386281fb57 (diff) | |
| parent | 844493d7e99cb795f3e28130ee09ba7a6441162f (diff) | |
Subtree merge tag 'v6.13-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
[rockchip fixes from Jonas Karlman via IRC]
Diffstat (limited to 'dts/upstream/Bindings/memory-controllers')
3 files changed, 59 insertions, 9 deletions
diff --git a/dts/upstream/Bindings/memory-controllers/exynos-srom.yaml b/dts/upstream/Bindings/memory-controllers/exynos-srom.yaml index 10a2d97e5f8..a5598ade399 100644 --- a/dts/upstream/Bindings/memory-controllers/exynos-srom.yaml +++ b/dts/upstream/Bindings/memory-controllers/exynos-srom.yaml @@ -66,9 +66,8 @@ patternProperties: samsung,srom-timing: $ref: /schemas/types.yaml#/definitions/uint32-array - items: - minItems: 6 - maxItems: 6 + minItems: 6 + maxItems: 6 description: | Array of 6 integers, specifying bank timings in the following order: Tacp, Tcah, Tcoh, Tacc, Tcos, Tacs. diff --git a/dts/upstream/Bindings/memory-controllers/fsl/fsl,ddr.yaml b/dts/upstream/Bindings/memory-controllers/fsl/fsl,ddr.yaml index 84f778a9954..e0786153eec 100644 --- a/dts/upstream/Bindings/memory-controllers/fsl/fsl,ddr.yaml +++ b/dts/upstream/Bindings/memory-controllers/fsl/fsl,ddr.yaml @@ -40,6 +40,7 @@ properties: - fsl,p1021-memory-controller - fsl,p2020-memory-controller - fsl,qoriq-memory-controller + - nxp,imx9-memory-controller interrupts: maxItems: 1 @@ -51,13 +52,41 @@ properties: type: boolean reg: - maxItems: 1 + items: + - description: Controller register space + - description: Inject register space + minItems: 1 + + reg-names: + items: + - const: ctrl + - const: inject + minItems: 1 required: - compatible - interrupts - reg +allOf: + - if: + properties: + compatible: + contains: + enum: + - nxp,imx9-memory-controller + then: + properties: + reg: + minItems: 2 + reg-names: + minItems: 2 + else: + properties: + reg: + maxItems: 1 + reg-names: false + additionalProperties: false examples: diff --git a/dts/upstream/Bindings/memory-controllers/fsl/fsl,ifc.yaml b/dts/upstream/Bindings/memory-controllers/fsl/fsl,ifc.yaml index d1c3421bee1..f7cf0f91c1c 100644 --- a/dts/upstream/Bindings/memory-controllers/fsl/fsl,ifc.yaml +++ b/dts/upstream/Bindings/memory-controllers/fsl/fsl,ifc.yaml @@ -58,17 +58,39 @@ properties: access window as configured. patternProperties: - "^.*@[a-f0-9]+(,[a-f0-9]+)+$": + "^nand@[a-f0-9]+(,[a-f0-9]+)+$": type: object - description: | - Child device nodes describe the devices connected to IFC such as NOR (e.g. - cfi-flash) and NAND (fsl,ifc-nand). There might be board specific devices - like FPGAs, CPLDs, etc. + properties: + compatible: + const: fsl,ifc-nand + + reg: + maxItems: 1 + + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + + patternProperties: + "^partition@[0-9a-f]+": + $ref: /schemas/mtd/partitions/partition.yaml# + deprecated: true required: - compatible - reg + additionalProperties: false + + "(flash|fpga|board-control|cpld)@[a-f0-9]+(,[a-f0-9]+)+$": + type: object + oneOf: + - $ref: /schemas/board/fsl,fpga-qixis.yaml# + - $ref: /schemas/mtd/mtd-physmap.yaml# + unevaluatedProperties: false + required: - compatible - reg |