Commit 5ee1b02a authored by Nícolas F. R. A. Prado's avatar Nícolas F. R. A. Prado Committed by Hans Verkuil
Browse files

media: dt-bindings: mediatek,vcodec: Remove VDEC_SYS register space 



The binding expects the first register space to be VDEC_SYS. However
this register space is already assigned to a different node on both
MT8173 and MT8183: a clock-controller node called 'vdecsys' which is
also a syscon.

In order to resolve the overlapping address ranges, remove the VDEC_SYS
register space from the video decoder, and add a new property to hold
the phandle to the syscon, so that iospace can still be handled.

Also add reg-names to be able to tell that this new register schema is
used, so the driver can keep backward compatibility.

Signed-off-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 4115cd8c

Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml

+24 −4
Original line number Diff line number Diff line
@@ -21,7 +21,22 @@ properties: 
      - mediatek,mt8183-vcodec-dec



  reg:

    maxItems: 12

    minItems: 11

    maxItems: 11



  reg-names:

    items:

      - const: misc

      - const: ld

      - const: top

      - const: cm

      - const: ad

      - const: av

      - const: pp

      - const: hwd

      - const: hwq

      - const: hwb

      - const: hwg



  interrupts:

    maxItems: 1
@@ -60,6 +75,10 @@ properties: 
    description:

      Describes point to scp.



  mediatek,vdecsys:

    $ref: /schemas/types.yaml#/definitions/phandle

    description: Phandle to the vdecsys syscon node.



required:

  - compatible

  - reg
@@ -67,6 +86,7 @@ required: 
  - clocks

  - clock-names

  - iommus

  - mediatek,vdecsys



allOf:

  - if:
@@ -126,10 +146,9 @@ examples: 
    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/power/mt8173-power.h>



    vcodec_dec: vcodec@16000000 {

    vcodec_dec: vcodec@16020000 {

      compatible = "mediatek,mt8173-vcodec-dec";

      reg = <0x16000000 0x100>,   /*VDEC_SYS*/

          <0x16020000 0x1000>,  /*VDEC_MISC*/

      reg = <0x16020000 0x1000>,  /*VDEC_MISC*/

          <0x16021000 0x800>,   /*VDEC_LD*/

          <0x16021800 0x800>,   /*VDEC_TOP*/

          <0x16022000 0x1000>,  /*VDEC_CM*/
@@ -150,6 +169,7 @@ examples: 
             <&iommu M4U_PORT_HW_VDEC_VLD_EXT>,

             <&iommu M4U_PORT_HW_VDEC_VLD2_EXT>;

      mediatek,vpu = <&vpu>;

      mediatek,vdecsys = <&vdecsys>;

      power-domains = <&scpsys MT8173_POWER_DOMAIN_VDEC>;

      clocks = <&apmixedsys CLK_APMIXED_VCODECPLL>,

             <&topckgen CLK_TOP_UNIVPLL_D2>,