diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 13:48:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 13:48:22 +0100 |
| commit | ff8b4030161b58be72d756337bf0e1c8ce21a97c (patch) | |
| tree | e304424ab6245a1ab409e4f0994f929c61c75bf1 /Documentation | |
| parent | d1d38455235370e4e5f02e84d3f197d57129977c (diff) | |
| parent | 11430072551f5d5a37f58e390b3d042035992ca4 (diff) | |
| download | linux-next-ff8b4030161b58be72d756337bf0e1c8ce21a97c.tar.gz linux-next-ff8b4030161b58be72d756337bf0e1c8ce21a97c.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
Diffstat (limited to 'Documentation')
3 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.yaml b/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.yaml index 02f0b0462377..bf9923b63852 100644 --- a/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.yaml +++ b/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.yaml @@ -22,6 +22,7 @@ properties: - nvidia,tegra186-efuse - nvidia,tegra194-efuse - nvidia,tegra234-efuse + - nvidia,tegra264-efuse - items: - const: nvidia,tegra132-efuse diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml index 9398aae49093..8e0c67d671f9 100644 --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml @@ -16,9 +16,13 @@ description: | properties: compatible: - enum: - - nvidia,tegra114-emc - - nvidia,tegra124-emc + oneOf: + - enum: + - nvidia,tegra114-emc + - nvidia,tegra124-emc + - items: + - const: nvidia,tegra132-emc + - const: nvidia,tegra124-emc reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml index f8747cebb680..2f1ffd27e1d9 100644 --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml @@ -22,6 +22,7 @@ properties: enum: - nvidia,tegra114-mc - nvidia,tegra124-mc + - nvidia,tegra132-mc reg: maxItems: 1 |