Merge tag '5.4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / media / nvidia,tegra-vde.txt

diff --git a/Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt b/Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
index 7302e949e662cb8070fb0a32b9f77d75bd249c62..602169b8aa1986a9d9c215c3ca764c16376e364f 100644 (file)
--- a/Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
+++ b/Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
@@ -35,6 +35,7 @@ Optional properties:
 - resets : Must contain an entry for each entry in reset-names.
 - reset-names : Must include the following entries:
   - mc
+- iommus: Must contain phandle to the IOMMU device node.
 
 Example:
 
@@ -59,4 +60,5 @@ video-codec@6001a000 {
        clocks = <&tegra_car TEGRA20_CLK_VDE>;
        reset-names = "vde", "mc";
        resets = <&tegra_car 61>, <&mc TEGRA20_MC_RESET_VDE>;
+       iommus = <&mc TEGRA_SWGROUP_VDE>;
 };