History

Merge tag 'memory-controller-drv-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers

Memory controller drivers for v6.1, part 2 Improvements in Synopsys DesignWare Universal Multi-Protocol Memory Controller Devicetree bindings. The bindings are being split into one related to Synopsys core and into quite different derivative Zynq A05 DDR Memory Controller. Extend the Synopsys bindings with additional properties to match upcoming new device support (Baikal-T1 support). * tag 'memory-controller-drv-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl: dt-bindings: memory: snps,dw-umctl2-ddrc: Extend schema with IRQs/resets/clocks props dt-bindings: memory: snps,dw-umctl2-ddrc: Replace opencoded numbers with macros dt-bindings: memory: snps,dw-umctl2-ddrc: Use more descriptive device name dt-bindings: memory: synopsys,ddrc-ecc: Detach Zynq DDRC controller support

Arnd Bergmann committed 4 years ago

Commit f6f7d872 parents f8acc84 5514acb4 files · +158 −76Browse files

Unified · Split

4 files
  1. Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml +118 −0
  2. Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml +0 −76
  3. Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml +38 −0
  4. MAINTAINERS +2 −0
Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml+118−0
@@ -0,0 +1,118 @@
1+# SPDX-License-Identifier: GPL-2.0-only
2+%YAML 1.2
3+---
4+$id: http://devicetree.org/schemas/memory-controllers/snps,dw-umctl2-ddrc.yaml#
5+$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+title: Synopsys DesignWare Universal Multi-Protocol Memory Controller
8+
9+maintainers:
10+ - Krzysztof Kozlowski <krzk@kernel.org>
11+ - Manish Narani <manish.narani@xilinx.com>
12+ - Michal Simek <michal.simek@xilinx.com>
13+
14+description: |
15+ Synopsys DesignWare Enhanced uMCTL2 DDR Memory Controller is capable of
16+ working with the memory devices supporting up to (LP)DDR4 protocol. It can
17+ be equipped with SEC/DEC ECC feature if DRAM data bus width is either
18+ 16-bits or 32-bits or 64-bits wide.
19+
20+ For instance the ZynqMP DDR controller is based on the DW uMCTL2 v2.40a
21+ controller. It has an optional SEC/DEC ECC support in 64- and 32-bits
22+ bus width configurations.
23+
24+properties:
25+ compatible:
26+ oneOf:
27+ - deprecated: true
28+ description: Synopsys DW uMCTL2 DDR controller v3.80a
29+ const: snps,ddrc-3.80a
30+ - description: Synopsys DW uMCTL2 DDR controller
31+ const: snps,dw-umctl2-ddrc
32+ - description: Xilinx ZynqMP DDR controller v2.40a
33+ const: xlnx,zynqmp-ddrc-2.40a
34+
35+ interrupts:
36+ description:
37+ DW uMCTL2 DDRC IP-core provides individual IRQ signal for each event":"
38+ ECC Corrected Error, ECC Uncorrected Error, ECC Address Protection,
39+ Scrubber-Done signal, DFI Parity/CRC Error. Some platforms may have the
40+ signals merged before they reach the IRQ controller or have some of them
41+ absent in case if the corresponding feature is unavailable/disabled.
42+ minItems: 1
43+ maxItems: 5
44+
45+ interrupt-names:
46+ minItems: 1
47+ maxItems: 5
48+ oneOf:
49+ - description: Common ECC CE/UE/Scrubber/DFI Errors IRQ
50+ items:
51+ - const: ecc
52+ - description: Individual ECC CE/UE/Scrubber/DFI Errors IRQs
53+ items:
54+ enum: [ ecc_ce, ecc_ue, ecc_ap, ecc_sbr, dfi_e ]
55+
56+ reg:
57+ maxItems: 1
58+
59+ clocks:
60+ description:
61+ A standard set of the clock sources contains CSRs bus clock, AXI-ports
62+ reference clock, DDRC core clock, Scrubber standalone clock
63+ (synchronous to the DDRC clock).
64+ minItems: 1
65+ maxItems: 4
66+
67+ clock-names:
68+ minItems: 1
69+ maxItems: 4
70+ items:
71+ enum: [ pclk, aclk, core, sbr ]
72+
73+ resets:
74+ description:
75+ Each clock domain can have separate reset signal.
76+ minItems: 1
77+ maxItems: 4
78+
79+ reset-names:
80+ minItems: 1
81+ maxItems: 4
82+ items:
83+ enum: [ prst, arst, core, sbr ]
84+
85+required:
86+ - compatible
87+ - reg
88+ - interrupts
89+
90+additionalProperties: false
91+
92+examples:
93+ - |
94+ #include <dt-bindings/interrupt-controller/arm-gic.h>
95+
96+ memory-controller@fd070000 {
97+ compatible = "xlnx,zynqmp-ddrc-2.40a";
98+ reg = <0xfd070000 0x30000>;
99+
100+ interrupt-parent = <&gic>;
101+ interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
102+ interrupt-names = "ecc";
103+ };
104+ - |
105+ #include <dt-bindings/interrupt-controller/irq.h>
106+
107+ memory-controller@3d400000 {
108+ compatible = "snps,dw-umctl2-ddrc";
109+ reg = <0x3d400000 0x400000>;
110+
111+ interrupts = <147 IRQ_TYPE_LEVEL_HIGH>, <148 IRQ_TYPE_LEVEL_HIGH>,
112+ <149 IRQ_TYPE_LEVEL_HIGH>, <150 IRQ_TYPE_LEVEL_HIGH>;
113+ interrupt-names = "ecc_ce", "ecc_ue", "ecc_sbr", "dfi_e";
114+
115+ clocks = <&pclk>, <&aclk>, <&core_clk>, <&sbr_clk>;
116+ clock-names = "pclk", "aclk", "core", "sbr";
117+ };
118+...
Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml+0−76
@@ -1,76 +0,0 @@
1−# SPDX-License-Identifier: GPL-2.0-only
2−%YAML 1.2
3−---
4−$id: http://devicetree.org/schemas/memory-controllers/synopsys,ddrc-ecc.yaml#
5−$schema: http://devicetree.org/meta-schemas/core.yaml#
6−
7−title: Synopsys IntelliDDR Multi Protocol memory controller
8−
9−maintainers:
10− - Krzysztof Kozlowski <krzk@kernel.org>
11− - Manish Narani <manish.narani@xilinx.com>
12− - Michal Simek <michal.simek@xilinx.com>
13−
14−description: |
15− The ZynqMP DDR ECC controller has an optional ECC support in 64-bit and
16− 32-bit bus width configurations.
17−
18− The Zynq DDR ECC controller has an optional ECC support in half-bus width
19− (16-bit) configuration.
20−
21− These both ECC controllers correct single bit ECC errors and detect double bit
22− ECC errors.
23−
24−properties:
25− compatible:
26− enum:
27− - snps,ddrc-3.80a
28− - xlnx,zynq-ddrc-a05
29− - xlnx,zynqmp-ddrc-2.40a
30−
31− interrupts:
32− maxItems: 1
33−
34− reg:
35− maxItems: 1
36−
37−required:
38− - compatible
39− - reg
40−
41−allOf:
42− - if:
43− properties:
44− compatible:
45− contains:
46− enum:
47− - snps,ddrc-3.80a
48− - xlnx,zynqmp-ddrc-2.40a
49− then:
50− required:
51− - interrupts
52− else:
53− properties:
54− interrupts: false
55−
56−additionalProperties: false
57−
58−examples:
59− - |
60− memory-controller@f8006000 {
61− compatible = "xlnx,zynq-ddrc-a05";
62− reg = <0xf8006000 0x1000>;
63− };
64−
65− - |
66− axi {
67− #address-cells = <2>;
68− #size-cells = <2>;
69−
70− memory-controller@fd070000 {
71− compatible = "xlnx,zynqmp-ddrc-2.40a";
72− reg = <0x0 0xfd070000 0x0 0x30000>;
73− interrupt-parent = <&gic>;
74− interrupts = <0 112 4>;
75− };
76− };
Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml+38−0
@@ -0,0 +1,38 @@
1+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+%YAML 1.2
3+---
4+$id: http://devicetree.org/schemas/memory-controllers/xlnx,zynq-ddrc-a05.yaml#
5+$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+title: Zynq A05 DDR Memory Controller
8+
9+maintainers:
10+ - Krzysztof Kozlowski <krzk@kernel.org>
11+ - Manish Narani <manish.narani@xilinx.com>
12+ - Michal Simek <michal.simek@xilinx.com>
13+
14+description:
15+ The Zynq DDR ECC controller has an optional ECC support in half-bus width
16+ (16-bit) configuration. It is cappable of correcting single bit ECC errors
17+ and detecting double bit ECC errors.
18+
19+properties:
20+ compatible:
21+ const: xlnx,zynq-ddrc-a05
22+
23+ reg:
24+ maxItems: 1
25+
26+required:
27+ - compatible
28+ - reg
29+
30+additionalProperties: false
31+
32+examples:
33+ - |
34+ memory-controller@f8006000 {
35+ compatible = "xlnx,zynq-ddrc-a05";
36+ reg = <0xf8006000 0x1000>;
37+ };
38+...
MAINTAINERS+2−0
@@ -3087,6 +3087,8 @@ W: http://wiki.xilinx.com · 3086 unmodified lines
30873087 T: git https://github.com/Xilinx/linux-xlnx.git
30883088 F: Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
30893089 F: Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
3090+F: Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml
3091+F: Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml
30903092 F: Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
30913093 F: arch/arm/mach-zynq/
30923094 F: drivers/clocksource/timer-cadence-ttc.c

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t