diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 12:26:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 12:26:16 +0100 |
| commit | e7135a28430dfa01079a975de235fa2104896473 (patch) | |
| tree | edfa71c0a8b10e059e6e06d1c8a0b5345757c59d /Documentation/devicetree/bindings/media | |
| parent | 37cd15e68fc2c695016d791ec9e284024d619680 (diff) | |
| parent | 50edc257a152541b8bcdc84f77de5e4efad7013d (diff) | |
| download | linux-stable-e7135a28430dfa01079a975de235fa2104896473.tar.gz linux-stable-e7135a28430dfa01079a975de235fa2104896473.tar.bz2 linux-stable-e7135a28430dfa01079a975de235fa2104896473.zip | |
Merge tag 'sunxi-fixes-for-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
- RSB bus communication fixes
- missing IOMMU reference property to H6 Hantro G2
* tag 'sunxi-fixes-for-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: dts: allwinner: h6: Add IOMMU reference to Hantro G2
media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property
bus: sunxi-rsb: Support atomic transfers
bus: sunxi-rsb: Remove the shutdown callback
Link: https://lore.kernel.org/r/Y3ftpBFk5+fndA4B@jernej-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/media')
| -rw-r--r-- | Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml b/Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml index 24d7bf21499e..9d44236f2deb 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml @@ -36,6 +36,9 @@ properties: resets: maxItems: 1 + iommus: + maxItems: 1 + required: - compatible - reg @@ -43,6 +46,7 @@ required: - clocks - clock-names - resets + - iommus additionalProperties: false @@ -59,6 +63,7 @@ examples: clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>; clock-names = "bus", "mod"; resets = <&ccu RST_BUS_VP9>; + iommus = <&iommu 5>; }; ... |