diff options
| author | Thierry Reding <treding@nvidia.com> | 2026-05-29 00:34:50 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2026-05-29 00:34:50 +0200 |
| commit | 60b99efb222d9dd2dcd09dc686af42973270ee1d (patch) | |
| tree | 0974faec091cd584ec7c564fbfb58eaaf427a6cd /Documentation | |
| parent | 254f49634ee16a731174d2ae34bc50bd5f45e731 (diff) | |
| parent | 1f1471284e9b5c2317b4dd8710270aa33c2fd2fe (diff) | |
| download | linux-next-history-60b99efb222d9dd2dcd09dc686af42973270ee1d.tar.gz | |
Merge branch for-7.2/dt-bindings into for-next
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml index dcd1c53765077..dd1f637e4175a 100644 --- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml +++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml @@ -16,6 +16,7 @@ properties: - nvidia,tegra186-pmc - nvidia,tegra194-pmc - nvidia,tegra234-pmc + - nvidia,tegra238-pmc - nvidia,tegra264-pmc reg: @@ -76,6 +77,7 @@ allOf: contains: enum: - nvidia,tegra234-pmc + - nvidia,tegra238-pmc - nvidia,tegra264-pmc then: properties: diff --git a/Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml b/Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml index 4380f622f9a91..6efadc5f80785 100644 --- a/Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml +++ b/Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml @@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Tegra CPU-NS - BPMP IPC reserved memory maintainers: - - Peter De Schrijver <pdeschrijver@nvidia.com> + - Thierry Reding <thierry.reding@kernel.org> + - Jonathan Hunter <jonathanh@nvidia.com> description: | Define a memory region used for communication between CPU-NS and BPMP. |