MT8173 and MT8183 have different clocks, and consequently clock-names.
Relax the number of clocks and set clock-names based on compatible.
Signed-off-by: Nícolas F. R. A. Prado <[email protected]>
---
.../media/mediatek,vcodec-decoder.yaml | 29 +++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
index fad59b486d5d..57d5ca776df0 100644
--- a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
+++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
@@ -27,18 +27,12 @@ properties:
maxItems: 1
clocks:
+ minItems: 1
maxItems: 8
clock-names:
- items:
- - const: vcodecpll
- - const: univpll_d2
- - const: clk_cci400_sel
- - const: vdec_sel
- - const: vdecpll
- - const: vencpll
- - const: venc_lt_sel
- - const: vdec_bus_clk_src
+ minItems: 1
+ maxItems: 8
assigned-clocks: true
@@ -88,6 +82,11 @@ allOf:
required:
- mediatek,scp
+ properties:
+ clock-names:
+ items:
+ - const: vdec
+
- if:
properties:
compatible:
@@ -99,6 +98,18 @@ allOf:
required:
- mediatek,vpu
+ properties:
+ clock-names:
+ items:
+ - const: vcodecpll
+ - const: univpll_d2
+ - const: clk_cci400_sel
+ - const: vdec_sel
+ - const: vdecpll
+ - const: vencpll
+ - const: venc_lt_sel
+ - const: vdec_bus_clk_src
+
additionalProperties: false
examples:
--
2.40.1
On 05/06/2023 18:20, Nícolas F. R. A. Prado wrote:
> MT8173 and MT8183 have different clocks, and consequently clock-names.
> Relax the number of clocks and set clock-names based on compatible.
>
> Signed-off-by: Nícolas F. R. A. Prado <[email protected]>
Reviewed-by: Matthias Brugger <[email protected]>
>
> ---
>
> .../media/mediatek,vcodec-decoder.yaml | 29 +++++++++++++------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
> index fad59b486d5d..57d5ca776df0 100644
> --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
> +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
> @@ -27,18 +27,12 @@ properties:
> maxItems: 1
>
> clocks:
> + minItems: 1
> maxItems: 8
>
> clock-names:
> - items:
> - - const: vcodecpll
> - - const: univpll_d2
> - - const: clk_cci400_sel
> - - const: vdec_sel
> - - const: vdecpll
> - - const: vencpll
> - - const: venc_lt_sel
> - - const: vdec_bus_clk_src
> + minItems: 1
> + maxItems: 8
>
> assigned-clocks: true
>
> @@ -88,6 +82,11 @@ allOf:
> required:
> - mediatek,scp
>
> + properties:
> + clock-names:
> + items:
> + - const: vdec
> +
> - if:
> properties:
> compatible:
> @@ -99,6 +98,18 @@ allOf:
> required:
> - mediatek,vpu
>
> + properties:
> + clock-names:
> + items:
> + - const: vcodecpll
> + - const: univpll_d2
> + - const: clk_cci400_sel
> + - const: vdec_sel
> + - const: vdecpll
> + - const: vencpll
> + - const: venc_lt_sel
> + - const: vdec_bus_clk_src
> +
> additionalProperties: false
>
> examples:
Il 05/06/23 18:20, Nícolas F. R. A. Prado ha scritto:
> MT8173 and MT8183 have different clocks, and consequently clock-names.
> Relax the number of clocks and set clock-names based on compatible.
>
> Signed-off-by: Nícolas F. R. A. Prado <[email protected]>
>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
On 05/06/2023 18:20, Nícolas F. R. A. Prado wrote:
> MT8173 and MT8183 have different clocks, and consequently clock-names.
> Relax the number of clocks and set clock-names based on compatible.
>
> Signed-off-by: Nícolas F. R. A. Prado <[email protected]>
>
> ---
>
> .../media/mediatek,vcodec-decoder.yaml | 29 +++++++++++++------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
> index fad59b486d5d..57d5ca776df0 100644
> --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
> +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
> @@ -27,18 +27,12 @@ properties:
> maxItems: 1
>
> clocks:
> + minItems: 1
> maxItems: 8
>
> clock-names:
> - items:
> - - const: vcodecpll
> - - const: univpll_d2
> - - const: clk_cci400_sel
> - - const: vdec_sel
> - - const: vdecpll
> - - const: vencpll
> - - const: venc_lt_sel
> - - const: vdec_bus_clk_src
> + minItems: 1
> + maxItems: 8
>
> assigned-clocks: true
>
> @@ -88,6 +82,11 @@ allOf:
> required:
> - mediatek,scp
>
> + properties:
> + clock-names:
> + items:
> + - const: vdec
You should constrain also clocks as they must be in sync with names.
> +
> - if:
> properties:
> compatible:
> @@ -99,6 +98,18 @@ allOf:
> required:
> - mediatek,vpu
>
> + properties:
> + clock-names:
> + items:
> + - const: vcodecpll
> + - const: univpll_d2
> + - const: clk_cci400_sel
> + - const: vdec_sel
> + - const: vdecpll
> + - const: vencpll
> + - const: venc_lt_sel
> + - const: vdec_bus_clk_src
Ditto.
Best regards,
Krzysztof