| Message ID | 20240127084258.68302-1-eugen.hristev@collabora.com |
|---|---|
| State | Accepted |
| Commit | ebd27256bd14a5458c8cefa4a4d5169ab3fc6c09 |
| Headers | show |
| Series | [v3,1/2] dt-bindings: media: mediatek-jpeg-encoder: change max iommus count | expand |
On Sat, 27 Jan 2024 10:42:57 +0200, Eugen Hristev wrote: > MT8186 has 4 iommus in the list, to cope with this situation, adjust > the maxItems to 4 (instead of previous 2). > Add also minItems as 2 to keep compatibility with current devices. > > Applied to v6.4-next/dts64, thanks! [1/2] dt-bindings: media: mediatek-jpeg-encoder: change max iommus count commit: b824b32dd5e98221cbe2e8bcccc6fb4134e35fc1 [2/2] arm64: dts: mediatek: mt8186: Add jpgenc node commit: 4c5b46fbf52d52b0f392f0fc3913560bad438e49 Best regards,
Il 29/01/24 16:46, Matthias Brugger ha scritto: > > > On 29/01/2024 11:41, AngeloGioacchino Del Regno wrote: >> >> On Sat, 27 Jan 2024 10:42:57 +0200, Eugen Hristev wrote: >>> MT8186 has 4 iommus in the list, to cope with this situation, adjust >>> the maxItems to 4 (instead of previous 2). >>> Add also minItems as 2 to keep compatibility with current devices. >>> >>> >> >> Applied to v6.4-next/dts64, thanks! >> >> [1/2] dt-bindings: media: mediatek-jpeg-encoder: change max iommus count >> commit: b824b32dd5e98221cbe2e8bcccc6fb4134e35fc1 > > Hm, not sure why you took this one, as DT-Bindings normally go through the > subsystem maintainer trees. Otherwise merge conflicts can occur. Just saying. > That was done so that we don't get devicetree validation issues on our branch; eventually, there were no driver changes to support that binding change, and it's there just to validate commit 2/2. Of course the media maintainers do know about this so there will be no merge conflict - but yes next time I'll let them pick these instead, it's probably easier for everyone, besides simply being the proper thing to do. Angelo > Matthias > > >> [2/2] arm64: dts: mediatek: mt8186: Add jpgenc node >> commit: 4c5b46fbf52d52b0f392f0fc3913560bad438e49 >> >> Best regards,
diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml index 37800e1908cc..83c020a673d6 100644 --- a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml @@ -38,7 +38,8 @@ properties: maxItems: 1 iommus: - maxItems: 2 + minItems: 2 + maxItems: 4 description: | Points to the respective IOMMU block with master port as argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.