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 1 since iommus are mandatory, to avoid warning
on the example.
Signed-off-by: Eugen Hristev <[email protected]>
---
.../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..60c75b9312e8 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: 1
+ 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]>
---
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 e451b6c8cd9e..ef1b269f9184 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: jpgenc@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";
+ power-domains = <&spm MT8186_POWER_DOMAIN_VENC>;
+ 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>;
+ };
+
camsys: clock-controller@1a000000 {
compatible = "mediatek,mt8186-camsys";
reg = <0 0x1a000000 0 0x1000>;
--
2.34.1
Il 27/12/23 14:08, 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]>
> ---
> 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 e451b6c8cd9e..ef1b269f9184 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: jpgenc@17030000 {
Can we please call this jpeg-encoder@17030000 instead?
> + 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";
clock-names ...
iommus ....
power-domains ...
Cheers,
Angelo
Il 27/12/23 14:08, Eugen Hristev ha scritto:
> 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 1 since iommus are mandatory, to avoid warning
> on the example.
>
> Signed-off-by: Eugen Hristev <[email protected]>
> ---
> .../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..60c75b9312e8 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: 1
> + maxItems: 4
> description: |
> Points to the respective IOMMU block with master port as argument, see
> Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
(commit title) `ioomus` is something I've never heard of before... :-P
Please fix the typo, after which:
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
On Wed, Dec 27, 2023 at 03:08:11PM +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 1 since iommus are mandatory, to avoid warning
> on the example.
maxItems alone means minItems is the same size. If IOMMU is required,
then 'required' is where that is defined. Is there a case where 1 IOMMU
is valid? If so, what h/w has this case.
Rob
On 1/9/24 05:27, Rob Herring wrote:
> On Wed, Dec 27, 2023 at 03:08:11PM +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 1 since iommus are mandatory, to avoid warning
>> on the example.
>
> maxItems alone means minItems is the same size. If IOMMU is required,
> then 'required' is where that is defined. Is there a case where 1 IOMMU
> is valid? If so, what h/w has this case.
>
> Rob
>
>
Hello Rob,
Without setting a minItems , the example in the binding fails, because it has just
2 items, while the maxItems is now 4.
I set minItems as 1 to avoid restricting any kind of hardware to have at least 2
items, but if you claim that previously, maxItems=minItems=2 , I will change this to 2.
Is that fine with you ?
Eugen
On 15/01/2024 04:57, Eugen Hristev wrote:
> On 1/9/24 05:27, Rob Herring wrote:
>> On Wed, Dec 27, 2023 at 03:08:11PM +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 1 since iommus are mandatory, to avoid warning
>>> on the example.
>>
>> maxItems alone means minItems is the same size. If IOMMU is required,
>> then 'required' is where that is defined. Is there a case where 1 IOMMU
>> is valid? If so, what h/w has this case.
>>
>> Rob
>>
>>
>
> Hello Rob,
>
> Without setting a minItems , the example in the binding fails, because it has just
> 2 items, while the maxItems is now 4.
> I set minItems as 1 to avoid restricting any kind of hardware to have at least 2
> items, but if you claim that previously, maxItems=minItems=2 , I will change this to 2.
> Is that fine with you ?
>
I think that's what you should do yes. If in the future there shows up a
platform with just one iommu, then we can fix that.
Regards,
Matthias