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.
Signed-off-by: Eugen Hristev <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
Changes in v3:
minItems changed to 2.
Changes in v2:
fixed typo in subject
.../devicetree/bindings/media/mediatek-jpeg-encoder.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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.
--
2.34.1
From: Allen-KH Cheng <[email protected]>
Add JPEG encoder node.
Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: Hsin-Yi Wang <[email protected]>
Reviewed-by: Max Staudt <[email protected]>
Tested-by: Max Staudt <[email protected]>
Reviewed-by: Ricardo Ribalda <[email protected]>
[[email protected]: minor cleanup]
Signed-off-by: Eugen Hristev <[email protected]>
---
Changes in v3:
-none
Changes in v2:
- renamed node
- reordered props
arch/arm64/boot/dts/mediatek/mt8186.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8186.dtsi b/arch/arm64/boot/dts/mediatek/mt8186.dtsi
index 37a84d88036a..c93a8b82db76 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186.dtsi
@@ -2054,6 +2054,19 @@ venc: video-encoder@17020000 {
mediatek,scp = <&scp>;
};
+ jpgenc: jpeg-encoder@17030000 {
+ compatible = "mediatek,mt8186-jpgenc", "mediatek,mtk-jpgenc";
+ reg = <0 0x17030000 0 0x10000>;
+ interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&vencsys CLK_VENC_CKE2_JPGENC>;
+ clock-names = "jpgenc";
+ iommus = <&iommu_mm IOMMU_PORT_L7_JPGENC_Y_RDMA>,
+ <&iommu_mm IOMMU_PORT_L7_JPGENC_C_RDMA>,
+ <&iommu_mm IOMMU_PORT_L7_JPGENC_Q_TABLE>,
+ <&iommu_mm IOMMU_PORT_L7_JPGENC_BSDMA>;
+ power-domains = <&spm MT8186_POWER_DOMAIN_VENC>;
+ };
+
camsys: clock-controller@1a000000 {
compatible = "mediatek,mt8186-camsys";
reg = <0 0x1a000000 0 0x1000>;
--
2.34.1
Il 27/01/24 09:42, Eugen Hristev ha scritto:
> From: Allen-KH Cheng <[email protected]>
>
> Add JPEG encoder node.
>
> Signed-off-by: Allen-KH Cheng <[email protected]>
> Reviewed-by: Hsin-Yi Wang <[email protected]>
> Reviewed-by: Max Staudt <[email protected]>
> Tested-by: Max Staudt <[email protected]>
> Reviewed-by: Ricardo Ribalda <[email protected]>
> [[email protected]: minor cleanup]
> Signed-off-by: Eugen Hristev <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
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,
--
AngeloGioacchino Del Regno <[email protected]>
Il 29/01/24 11:41, AngeloGioacchino Del Regno ha scritto:
>
> 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!
>
Sorry, typo: v6.8-next/dts64
> [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,
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.
Matthias
> [2/2] arm64: dts: mediatek: mt8186: Add jpgenc node
> commit: 4c5b46fbf52d52b0f392f0fc3913560bad438e49
>
> Best regards,
(Drop a bunch of people from CC)
On Mon, Jan 29, 2024 at 6:48 PM AngeloGioacchino Del Regno
<[email protected]> wrote:
>
> Il 29/01/24 11:41, AngeloGioacchino Del Regno ha scritto:
> >
> > 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!
> >
>
> Sorry, typo: v6.8-next/dts64
I was wondering, what script produces this email?
AFAIK `b4 ty` gives a simple thank you letter without branch or commit
hashes.
ChenYu
> > [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,
Il 30/01/24 04:24, Chen-Yu Tsai ha scritto:
> (Drop a bunch of people from CC)
>
> On Mon, Jan 29, 2024 at 6:48 PM AngeloGioacchino Del Regno
> <[email protected]> wrote:
>>
>> Il 29/01/24 11:41, AngeloGioacchino Del Regno ha scritto:
>>>
>>> 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!
>>>
>>
>> Sorry, typo: v6.8-next/dts64
>
> I was wondering, what script produces this email?
>
> AFAIK `b4 ty` gives a simple thank you letter without branch or commit
> hashes.
>
That's exactly `b4 ty` :-)
You can use a custom template, so that it reads something like
`Applied to ${branch}, thanks!`
Cheers,
Angelo
> ChenYu
>
>>> [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,
>>
>>