Skip to content

Commit 53f986a

Browse files
digetxjoergroedel
digetx
authored and
joergroedel
committed
dt-bindings: memory: tegra: Squash tegra20-gart into tegra20-mc
Splitting GART and Memory Controller wasn't a good decision that was made back in the day. Given that the GART driver wasn't ever been used by anything in the kernel, we decided that it will be better to correct the mistakes of the past and merge two bindings into a single one. As a result there is a DT ABI change for the Memory Controller that allows not to break newer kernels using older DT and not to break older kernels using newer DT, that is done by changing the 'compatible' of the node to 'tegra20-mc-gart' and adding a new-required clock property. The new clock property also puts the tegra20-mc binding in line with the bindings of the later Tegra generations. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Reviewed-by: Rob Herring <robh@kernel.org> Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 2fc0ac1 commit 53f986a

File tree

2 files changed

+19
-22
lines changed

2 files changed

+19
-22
lines changed

‎Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt

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

‎Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.txt

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
NVIDIA Tegra20 MC(Memory Controller)
22

33
Required properties:
4-
- compatible : "nvidia,tegra20-mc"
5-
- reg : Should contain 2 register ranges(address and length); see the
6-
example below. Note that the MC registers are interleaved with the
7-
GART registers, and hence must be represented as multiple ranges.
4+
- compatible : "nvidia,tegra20-mc-gart"
5+
- reg : Should contain 2 register ranges: physical base address and length of
6+
the controller's registers and the GART aperture respectively.
7+
- clocks: Must contain an entry for each entry in clock-names.
8+
See ../clocks/clock-bindings.txt for details.
9+
- clock-names: Must include the following entries:
10+
- mc: the module's clock input
811
- interrupts : Should contain MC General interrupt.
912
- #reset-cells : Should be 1. This cell represents memory client module ID.
1013
The assignments may be found in header file <dt-bindings/memory/tegra20-mc.h>
1114
or in the TRM documentation.
15+
- #iommu-cells: Should be 0. This cell represents the number of cells in an
16+
IOMMU specifier needed to encode an address. GART supports only a single
17+
address space that is shared by all devices, therefore no additional
18+
information needed for the address encoding.
1219

1320
Example:
1421
mc: memory-controller@7000f000 {
15-
compatible = "nvidia,tegra20-mc";
16-
reg = <0x7000f000 0x024
17-
0x7000f03c 0x3c4>;
18-
interrupts = <0 77 0x04>;
22+
compatible = "nvidia,tegra20-mc-gart";
23+
reg = <0x7000f000 0x400 /* controller registers */
24+
0x58000000 0x02000000>; /* GART aperture */
25+
clocks = <&tegra_car TEGRA20_CLK_MC>;
26+
clock-names = "mc";
27+
interrupts = <GIC_SPI 77 0x04>;
1928
#reset-cells = <1>;
29+
#iommu-cells = <0>;
2030
};
2131

2232
video-codec@6001a000 {
2333
compatible = "nvidia,tegra20-vde";
2434
...
2535
resets = <&mc TEGRA20_MC_RESET_VDE>;
36+
iommus = <&mc>;
2637
};

0 commit comments

Comments
 (0)