diff options
| author | Thierry Reding <treding@nvidia.com> | 2023-05-16 12:10:47 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2023-05-16 12:10:47 +0200 |
| commit | f382b1fe71ca487b686fa9deefcc0714f50e6f6c (patch) | |
| tree | f30431e7cde53e040e66e584240402c441613fb0 | |
| parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
| parent | b0dae3df0546a5968ef8ea5b396d3de9b3a2295a (diff) | |
| download | lwn-f382b1fe71ca487b686fa9deefcc0714f50e6f6c.tar.gz lwn-f382b1fe71ca487b686fa9deefcc0714f50e6f6c.zip | |
Merge branch 'for-6.5/dt-bindings' into for-6.5/memory
| -rw-r--r-- | Documentation/devicetree/bindings/arm/tegra.yaml | 5 | ||||
| -rw-r--r-- | include/dt-bindings/memory/tegra234-mc.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.yaml b/Documentation/devicetree/bindings/arm/tegra.yaml index 0df41f5b7e2a..6970ca1b8bd8 100644 --- a/Documentation/devicetree/bindings/arm/tegra.yaml +++ b/Documentation/devicetree/bindings/arm/tegra.yaml @@ -167,6 +167,11 @@ properties: - const: nvidia,p3737-0000+p3701-0000 - const: nvidia,p3701-0000 - const: nvidia,tegra234 + - description: NVIDIA IGX Orin Development Kit + items: + - const: nvidia,p3740-0002+p3701-0008 + - const: nvidia,p3701-0008 + - const: nvidia,tegra234 - description: Jetson Orin NX items: - const: nvidia,p3767-0000 diff --git a/include/dt-bindings/memory/tegra234-mc.h b/include/dt-bindings/memory/tegra234-mc.h index 347e55e89a2a..6e60d55491b3 100644 --- a/include/dt-bindings/memory/tegra234-mc.h +++ b/include/dt-bindings/memory/tegra234-mc.h @@ -536,4 +536,9 @@ #define TEGRA234_MEMORY_CLIENT_NVJPG1SRD 0x123 #define TEGRA234_MEMORY_CLIENT_NVJPG1SWR 0x124 +/* ICC ID's for dummy MC clients used to represent CPU Clusters */ +#define TEGRA_ICC_MC_CPU_CLUSTER0 1003 +#define TEGRA_ICC_MC_CPU_CLUSTER1 1004 +#define TEGRA_ICC_MC_CPU_CLUSTER2 1005 + #endif |