| Message ID | 20220901102312.2005553-5-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings: display/msm: rework MDSS and DPU bindings | expand |
On Thu, Sep 01, 2022 at 01:23:04PM +0300, Dmitry Baryshkov wrote: > Move properties common to all DPU DT nodes to the dpu-common.yaml. > > Note, this removes description of individual DPU port@ nodes. However > such definitions add no additional value. The reg values do not > correspond to hardware INTF indices. The driver discovers and binds > these ports not paying any care for the order of these items. Thus just > leave the reference to graph.yaml#/properties/ports and the description. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../bindings/display/msm/dpu-common.yaml | 44 ++++++++++++++++++ > .../bindings/display/msm/dpu-msm8998.yaml | 46 ++----------------- > .../bindings/display/msm/dpu-qcm2290.yaml | 41 ++--------------- > .../bindings/display/msm/dpu-sc7180.yaml | 45 ++---------------- > .../bindings/display/msm/dpu-sc7280.yaml | 45 ++---------------- > .../bindings/display/msm/dpu-sdm845.yaml | 46 ++----------------- > 6 files changed, 64 insertions(+), 203 deletions(-) > create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-common.yaml > > diff --git a/Documentation/devicetree/bindings/display/msm/dpu-common.yaml b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml > new file mode 100644 > index 000000000000..bf5764e9932b > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml > @@ -0,0 +1,44 @@ > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/msm/dpu-common.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm Display DPU dt properties (common properties) > + > +maintainers: > + - Krishna Manikandan <quic_mkrishn@quicinc.com> > + - Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > + - Rob Clark <robdclark@gmail.com> > + > +description: | > + Common properties for QCom DPU display controller. > + > +properties: > + interrupts: > + maxItems: 1 > + > + power-domains: > + maxItems: 1 > + > + operating-points-v2: true > + opp-table: > + type: object > + > + ports: > + $ref: /schemas/graph.yaml#/properties/ports > + description: | > + Contains the list of output ports from DPU device. These ports > + connect to interfaces that are external to the DPU hardware, > + such as DSI, DP etc. Haven't we been over this already? You have to define 'port' nodes or else anything is allowed in them (and endpoint nodes). If you want to define them as pattern, then fine. But you must have a ref to graph.yaml#/properties/port. > + > +required: > + - compatible > + - reg > + - reg-names > + - clocks > + - interrupts > + - power-domains > + - operating-points-v2 > + - ports > + > +additionalProperties: true > diff --git a/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml b/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml > index 253665c693e6..0d6743eabd27 100644 > --- a/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml > @@ -62,7 +62,10 @@ patternProperties: > "^display-controller@[0-9a-f]+$": > type: object > description: Node containing the properties of DPU. > - additionalProperties: false > + unevaluatedProperties: false > + > + allOf: > + - $ref: /schemas/display/msm/dpu-common.yaml# Don't need allOf here. (and elsewhere) Rob
On 08/09/2022 00:13, Dmitry Baryshkov wrote: > On Wed, 7 Sept 2022 at 22:59, Rob Herring <robh@kernel.org> wrote: >> >> On Thu, Sep 01, 2022 at 01:23:04PM +0300, Dmitry Baryshkov wrote: >>> Move properties common to all DPU DT nodes to the dpu-common.yaml. >>> >>> Note, this removes description of individual DPU port@ nodes. However >>> such definitions add no additional value. The reg values do not >>> correspond to hardware INTF indices. The driver discovers and binds >>> these ports not paying any care for the order of these items. Thus just >>> leave the reference to graph.yaml#/properties/ports and the description. >>> >>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>> --- >>> .../bindings/display/msm/dpu-common.yaml | 44 ++++++++++++++++++ >>> .../bindings/display/msm/dpu-msm8998.yaml | 46 ++----------------- >>> .../bindings/display/msm/dpu-qcm2290.yaml | 41 ++--------------- >>> .../bindings/display/msm/dpu-sc7180.yaml | 45 ++---------------- >>> .../bindings/display/msm/dpu-sc7280.yaml | 45 ++---------------- >>> .../bindings/display/msm/dpu-sdm845.yaml | 46 ++----------------- >>> 6 files changed, 64 insertions(+), 203 deletions(-) >>> create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-common.yaml >>> >>> diff --git a/Documentation/devicetree/bindings/display/msm/dpu-common.yaml b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml >>> new file mode 100644 >>> index 000000000000..bf5764e9932b >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml >>> @@ -0,0 +1,44 @@ >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/display/msm/dpu-common.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: Qualcomm Display DPU dt properties (common properties) >>> + >>> +maintainers: >>> + - Krishna Manikandan <quic_mkrishn@quicinc.com> >>> + - Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>> + - Rob Clark <robdclark@gmail.com> >>> + >>> +description: | >>> + Common properties for QCom DPU display controller. >>> + >>> +properties: >>> + interrupts: >>> + maxItems: 1 >>> + >>> + power-domains: >>> + maxItems: 1 >>> + >>> + operating-points-v2: true >>> + opp-table: >>> + type: object >>> + >>> + ports: >>> + $ref: /schemas/graph.yaml#/properties/ports >>> + description: | >>> + Contains the list of output ports from DPU device. These ports >>> + connect to interfaces that are external to the DPU hardware, >>> + such as DSI, DP etc. >> >> Haven't we been over this already? >> >> You have to define 'port' nodes or else anything is allowed in them >> (and endpoint nodes). If you want to define them as pattern, then fine. >> But you must have a ref to graph.yaml#/properties/port. > > Last time you asked to do this, I did a check. Adding any additional > property results in a schema error. And this is logical. > graph.yaml#/properties/ports already limits the node properties. I > thus do not see a need to define port@[0-9a-f]+$. Did I miss anything? I see, what I did miss now. I missed adding properties to individual /port nodes. Please excuse me. BTW: is there any reason for not enforcing this in the graph.yaml?
diff --git a/Documentation/devicetree/bindings/display/msm/dpu-common.yaml b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml new file mode 100644 index 000000000000..bf5764e9932b --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml @@ -0,0 +1,44 @@ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/msm/dpu-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Display DPU dt properties (common properties) + +maintainers: + - Krishna Manikandan <quic_mkrishn@quicinc.com> + - Dmitry Baryshkov <dmitry.baryshkov@linaro.org> + - Rob Clark <robdclark@gmail.com> + +description: | + Common properties for QCom DPU display controller. + +properties: + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + operating-points-v2: true + opp-table: + type: object + + ports: + $ref: /schemas/graph.yaml#/properties/ports + description: | + Contains the list of output ports from DPU device. These ports + connect to interfaces that are external to the DPU hardware, + such as DSI, DP etc. + +required: + - compatible + - reg + - reg-names + - clocks + - interrupts + - power-domains + - operating-points-v2 + - ports + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml b/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml index 253665c693e6..0d6743eabd27 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml @@ -62,7 +62,10 @@ patternProperties: "^display-controller@[0-9a-f]+$": type: object description: Node containing the properties of DPU. - additionalProperties: false + unevaluatedProperties: false + + allOf: + - $ref: /schemas/display/msm/dpu-common.yaml# properties: compatible: @@ -99,47 +102,6 @@ patternProperties: - const: core - const: vsync - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - opp-table: - type: object - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI, DP etc. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI1) - - port@1: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF2 (DSI2) - - required: - - port@0 - - port@1 - - required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports - required: - compatible - reg diff --git a/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml b/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml index c5824e1d2382..bec3c131c0dc 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml @@ -74,7 +74,10 @@ patternProperties: "^display-controller@[0-9a-f]+$": type: object description: Node containing the properties of DPU. - additionalProperties: false + unevaluatedProperties: false + + allOf: + - $ref: /schemas/display/msm/dpu-common.yaml# properties: compatible: @@ -107,42 +110,6 @@ patternProperties: - const: lut - const: vsync - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - opp-table: - type: object - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI1) - - required: - - port@0 - - required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports - required: - compatible - reg diff --git a/Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml b/Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml index 4890bc25f3fd..732b9d8f968a 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml @@ -73,7 +73,10 @@ patternProperties: "^display-controller@[0-9a-f]+$": type: object description: Node containing the properties of DPU. - additionalProperties: false + unevaluatedProperties: false + + allOf: + - $ref: /schemas/display/msm/dpu-common.yaml# properties: compatible: @@ -108,46 +111,6 @@ patternProperties: - const: core - const: vsync - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - opp-table: - type: object - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI, DP etc. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI1) - - port@2: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF0 (DP) - - required: - - port@0 - - required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports - required: - compatible - reg diff --git a/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml b/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml index 584d646021d5..4889129660c6 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml @@ -72,7 +72,10 @@ patternProperties: "^display-controller@[0-9a-f]+$": type: object description: Node containing the properties of DPU. - additionalProperties: false + unevaluatedProperties: false + + allOf: + - $ref: /schemas/display/msm/dpu-common.yaml# properties: compatible: @@ -106,46 +109,6 @@ patternProperties: - const: core - const: vsync - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - opp-table: - type: object - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI, DP etc. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI) - - port@1: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF5 (EDP) - - required: - - port@0 - - required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports - required: - compatible - reg diff --git a/Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml b/Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml index ff19555d04e2..b275f928a921 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml @@ -75,7 +75,10 @@ patternProperties: "^display-controller@[0-9a-f]+$": type: object description: Node containing the properties of DPU. - additionalProperties: false + unevaluatedProperties: false + + allOf: + - $ref: /schemas/display/msm/dpu-common.yaml# properties: compatible: @@ -108,47 +111,6 @@ patternProperties: - const: core - const: vsync - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - opp-table: - type: object - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI, DP etc. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI1) - - port@1: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF2 (DSI2) - - required: - - port@0 - - port@1 - - required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports - required: - compatible - reg
Move properties common to all DPU DT nodes to the dpu-common.yaml. Note, this removes description of individual DPU port@ nodes. However such definitions add no additional value. The reg values do not correspond to hardware INTF indices. The driver discovers and binds these ports not paying any care for the order of these items. Thus just leave the reference to graph.yaml#/properties/ports and the description. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- .../bindings/display/msm/dpu-common.yaml | 44 ++++++++++++++++++ .../bindings/display/msm/dpu-msm8998.yaml | 46 ++----------------- .../bindings/display/msm/dpu-qcm2290.yaml | 41 ++--------------- .../bindings/display/msm/dpu-sc7180.yaml | 45 ++---------------- .../bindings/display/msm/dpu-sc7280.yaml | 45 ++---------------- .../bindings/display/msm/dpu-sdm845.yaml | 46 ++----------------- 6 files changed, 64 insertions(+), 203 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-common.yaml