| Message ID | 20220108190059.72583-1-david@ixit.cz (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [WIP] dt-bindings: display: msm: dsi-controller-main: distinguish DSI versions | expand |
On Sat, 8 Jan 2022 at 22:01, David Heidelberg <david@ixit.cz> wrote: > > Update documentation compatible and checking to comprehend > both V2 and 6G version bindings. > > Following this commit, there will be update for > compatible string in chipsets dtsi. > > Additional changes: > - switch to unevaluatedProperties > > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > Rob, I know you mentioned using rather chipset names, but since > meanwhile I coded this, I'll let you decide if should make sense to > change it or keep it this way. > > .../display/msm/dsi-controller-main.yaml | 271 +++++++++++++++--- > 1 file changed, 230 insertions(+), 41 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > index 35426fde8610..8eb41952c2a7 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -11,11 +11,227 @@ maintainers: > > allOf: > - $ref: "../dsi-controller.yaml#" > + # V2 and 6G definition: > + - if: > + properties: > + compatible: > + contains: > + pattern: '^qcom,dsi-ctrl-v2-[a-z0-9]+$' > + then: > + properties: > + clocks: > + minItems: 7 > + maxItems: 7 > + > + clock-names: > + items: > + - const: iface # from dsi_v2_bus_clk_names > + - const: bus > + - const: core_mmss > + - const: src # from dsi_clk_init_v2 > + - const: byte # from dsi_clk_init > + - const: pixel > + - const: core > + > + assigned-clocks: > + minItems: 4 > + maxItems: 4 > + description: > > + Parents of "byte", "esc", "src" and "pixel" for the given platform. > + > + assigned-clock-parents: > + minItems: 4 > + maxItems: 4 > + description: > > + The Byte, Escape, Source and Pixel clock PLL outputs provided by a DSI PHY block. > + > + syscon-sfpb: > + description: A phandle to mmss_sfpb syscon node. > + $ref: "/schemas/types.yaml#/definitions/phandle" > + > + avdd-supply: > + description: 3.0 V supply > + > + vdda-supply: > + description: 1.2 V supply > + > + vddio-supply: > + description: 1.8 V supply > + > + - if: > + properties: > + compatible: > + contains: > + pattern: '^qcom,dsi-ctrl-6g-v[0-9.]+$' > + then: > + properties: > + clocks: > + items: > + - description: Display byte clock > + - description: Display byte interface clock > + - description: Display pixel clock > + - description: Display escape clock > + - description: Display AHB clock > + - description: Display AXI clock > + > + clock-names: > + items: > + - const: byte > + - const: byte_intf > + - const: pixel > + - const: core > + - const: iface > + - const: bus > + > + assigned-clocks: > + minItems: 2 > + maxItems: 2 > + description: > > + Parents of "byte" and "pixel" for the given platform. > + > + assigned-clock-parents: > + minItems: 2 > + maxItems: 2 > + description: > > + The Byte and Pixel clock PLL outputs provided by a DSI PHY block. > + > + required: > + - power-domains > + - operating-points-v2 > + > + # Specific 6G revisions: > + - if: > + properties: > + compatible: > + contains: > + pattern: '^qcom,dsi-ctrl-6g-v1.[0-2].[0-9.]+$' > + then: > + properties: > + vdd-supply: > + description: 3.0 V supply > + > + vdda-supply: > + description: 1.2 V supply > + > + vddio-supply: > + description: 1.8 V supply > + > + - if: > + properties: > + compatible: > + contains: > + const: qcom,dsi-ctrl-6g-v1.3.0 > + then: > + properties: > + vcca-supply: > + description: 1.0 V supply > + > + vdd-supply: > + description: 1.8 V supply > + > + vdda-supply: > + description: 1.25 V supply > + > + vddio-supply: > + description: 1.8 V supply > + > + patternProperties: > + '^(lib_reg|ibb_reg)-supply$': true > + > + - if: > + properties: > + compatible: > + contains: > + const: qcom,dsi-ctrl-6g-v1.3.1 > + then: > + properties: > + vdda-supply: > + description: 1.2 V supply > + > + vddio-supply: > + description: 1.8 V supply > + > + - if: > + properties: > + compatible: > + contains: > + const: qcom,dsi-ctrl-6g-v1.4.1 > + then: > + properties: > + vcca-supply: > + description: 0.925 V supply > + > + vdda-supply: > + description: 1.25 V supply > + > + vddio-supply: > + description: 1.8 V supply > + > + - if: > + properties: > + compatible: > + contains: > + const: qcom,dsi-ctrl-6g-v1.4.2 > + then: > + properties: > + vdda-supply: > + description: 1.2 V supply > + > + vddio-supply: true > + > + - if: > + properties: > + compatible: > + contains: > + const: qcom,dsi-ctrl-6g-v2.2.0 > + then: > + properties: > + vdd-supply: true > + > + vdda-supply: > + description: 1.2 V supply > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,dsi-ctrl-6g-v2.1.0 > + - qcom,dsi-ctrl-6g-v2.2.1 > + - qcom,dsi-ctrl-6g-v2.3.0 > + - qcom,dsi-ctrl-6g-v2.4.0 > + - qcom,dsi-ctrl-6g-v2.4.1 > + - qcom,dsi-ctrl-6g-v2.5.0 > + then: > + properties: > + vdda-supply: > + description: 1.2 V supply > > properties: > compatible: > - items: > + oneOf: > + - items: > + - enum: > + - qcom,dsi-ctrl-v2-apq8064 > + - qcom,dsi-ctrl-6g-v1.0.0 > + - qcom,dsi-ctrl-6g-v1.1.0 > + - qcom,dsi-ctrl-6g-v1.1.1 > + - qcom,dsi-ctrl-6g-v1.2.0 > + - qcom,dsi-ctrl-6g-v1.3.0 > + - qcom,dsi-ctrl-6g-v1.3.1 > + - qcom,dsi-ctrl-6g-v1.4.1 > + - qcom,dsi-ctrl-6g-v1.4.2 > + - qcom,dsi-ctrl-6g-v2.1.0 > + - qcom,dsi-ctrl-6g-v2.2.0 > + - qcom,dsi-ctrl-6g-v2.2.1 > + - qcom,dsi-ctrl-6g-v2.3.0 > + - qcom,dsi-ctrl-6g-v2.4.0 > + - qcom,dsi-ctrl-6g-v2.4.1 > + - qcom,dsi-ctrl-6g-v2.5.0 > + - const: qcom,mdss-dsi-ctrl > + > - const: qcom,mdss-dsi-ctrl > + deprecated: true I'd suggest to list all other attributes after the 'compatible' , if that's possible. In my opinion, It's nice to know which compatibles are available, before actually checking which properties to define. > > reg: > maxItems: 1 > @@ -26,23 +242,13 @@ properties: > interrupts: > maxItems: 1 > > - clocks: > - items: > - - description: Display byte clock > - - description: Display byte interface clock > - - description: Display pixel clock > - - description: Display escape clock > - - description: Display AHB clock > - - description: Display AXI clock > - > - clock-names: > - items: > - - const: byte > - - const: byte_intf > - - const: pixel > - - const: core > - - const: iface > - - const: bus > + clocks: true > + > + clock-names: true > + > + assigned-clocks: true > + > + assigned-clock-parents: true > > phys: > maxItems: 1 > @@ -54,28 +260,12 @@ properties: > > "#size-cells": true > > - syscon-sfpb: > - description: A phandle to mmss_sfpb syscon node (only for DSIv2). > - $ref: "/schemas/types.yaml#/definitions/phandle" > - > qcom,dual-dsi-mode: > type: boolean > - description: | > + description: > > Indicates if the DSI controller is driving a panel which needs > 2 DSI links. > > - assigned-clocks: > - minItems: 2 > - maxItems: 2 > - description: | > - Parents of "byte" and "pixel" for the given platform. > - > - assigned-clock-parents: > - minItems: 2 > - maxItems: 2 > - description: | > - The Byte clock and Pixel clock PLL outputs provided by a DSI PHY block. > - > power-domains: > maxItems: 1 > > @@ -102,7 +292,7 @@ properties: > maxItems: 4 > minItems: 4 > items: > - enum: [ 0, 1, 2, 3 ] > + enum: [0, 1, 2, 3] > > port@1: > $ref: "/schemas/graph.yaml#/$defs/port-base" > @@ -118,7 +308,7 @@ properties: > maxItems: 4 > minItems: 4 > items: > - enum: [ 0, 1, 2, 3 ] > + enum: [0, 1, 2, 3] > > required: > - port@0 > @@ -135,11 +325,9 @@ required: > - phy-names > - assigned-clocks > - assigned-clock-parents > - - power-domains > - - operating-points-v2 > - ports > > -additionalProperties: false > +unevaluatedProperties: false > > examples: > - | > @@ -175,7 +363,8 @@ examples: > phys = <&dsi0_phy>; > phy-names = "dsi"; > > - assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>; > + assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, > + <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>; > assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>; > > power-domains = <&rpmhpd SC7180_CX>; > -- > 2.34.1 >
On Sat, Jan 08, 2022 at 08:00:58PM +0100, David Heidelberg wrote: > Update documentation compatible and checking to comprehend > both V2 and 6G version bindings. > > Following this commit, there will be update for > compatible string in chipsets dtsi. > > Additional changes: > - switch to unevaluatedProperties > > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > Rob, I know you mentioned using rather chipset names, but since > meanwhile I coded this, I'll let you decide if should make sense to > change it or keep it this way. It all depends on how many chips per version. I'm guessing only 1 or 2 given how many QCom SoCs I'm aware of. I think this should probably be split to 2 docs for the v2 and 6g versions. Rob
diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 35426fde8610..8eb41952c2a7 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -11,11 +11,227 @@ maintainers: allOf: - $ref: "../dsi-controller.yaml#" + # V2 and 6G definition: + - if: + properties: + compatible: + contains: + pattern: '^qcom,dsi-ctrl-v2-[a-z0-9]+$' + then: + properties: + clocks: + minItems: 7 + maxItems: 7 + + clock-names: + items: + - const: iface # from dsi_v2_bus_clk_names + - const: bus + - const: core_mmss + - const: src # from dsi_clk_init_v2 + - const: byte # from dsi_clk_init + - const: pixel + - const: core + + assigned-clocks: + minItems: 4 + maxItems: 4 + description: > + Parents of "byte", "esc", "src" and "pixel" for the given platform. + + assigned-clock-parents: + minItems: 4 + maxItems: 4 + description: > + The Byte, Escape, Source and Pixel clock PLL outputs provided by a DSI PHY block. + + syscon-sfpb: + description: A phandle to mmss_sfpb syscon node. + $ref: "/schemas/types.yaml#/definitions/phandle" + + avdd-supply: + description: 3.0 V supply + + vdda-supply: + description: 1.2 V supply + + vddio-supply: + description: 1.8 V supply + + - if: + properties: + compatible: + contains: + pattern: '^qcom,dsi-ctrl-6g-v[0-9.]+$' + then: + properties: + clocks: + items: + - description: Display byte clock + - description: Display byte interface clock + - description: Display pixel clock + - description: Display escape clock + - description: Display AHB clock + - description: Display AXI clock + + clock-names: + items: + - const: byte + - const: byte_intf + - const: pixel + - const: core + - const: iface + - const: bus + + assigned-clocks: + minItems: 2 + maxItems: 2 + description: > + Parents of "byte" and "pixel" for the given platform. + + assigned-clock-parents: + minItems: 2 + maxItems: 2 + description: > + The Byte and Pixel clock PLL outputs provided by a DSI PHY block. + + required: + - power-domains + - operating-points-v2 + + # Specific 6G revisions: + - if: + properties: + compatible: + contains: + pattern: '^qcom,dsi-ctrl-6g-v1.[0-2].[0-9.]+$' + then: + properties: + vdd-supply: + description: 3.0 V supply + + vdda-supply: + description: 1.2 V supply + + vddio-supply: + description: 1.8 V supply + + - if: + properties: + compatible: + contains: + const: qcom,dsi-ctrl-6g-v1.3.0 + then: + properties: + vcca-supply: + description: 1.0 V supply + + vdd-supply: + description: 1.8 V supply + + vdda-supply: + description: 1.25 V supply + + vddio-supply: + description: 1.8 V supply + + patternProperties: + '^(lib_reg|ibb_reg)-supply$': true + + - if: + properties: + compatible: + contains: + const: qcom,dsi-ctrl-6g-v1.3.1 + then: + properties: + vdda-supply: + description: 1.2 V supply + + vddio-supply: + description: 1.8 V supply + + - if: + properties: + compatible: + contains: + const: qcom,dsi-ctrl-6g-v1.4.1 + then: + properties: + vcca-supply: + description: 0.925 V supply + + vdda-supply: + description: 1.25 V supply + + vddio-supply: + description: 1.8 V supply + + - if: + properties: + compatible: + contains: + const: qcom,dsi-ctrl-6g-v1.4.2 + then: + properties: + vdda-supply: + description: 1.2 V supply + + vddio-supply: true + + - if: + properties: + compatible: + contains: + const: qcom,dsi-ctrl-6g-v2.2.0 + then: + properties: + vdd-supply: true + + vdda-supply: + description: 1.2 V supply + + - if: + properties: + compatible: + contains: + enum: + - qcom,dsi-ctrl-6g-v2.1.0 + - qcom,dsi-ctrl-6g-v2.2.1 + - qcom,dsi-ctrl-6g-v2.3.0 + - qcom,dsi-ctrl-6g-v2.4.0 + - qcom,dsi-ctrl-6g-v2.4.1 + - qcom,dsi-ctrl-6g-v2.5.0 + then: + properties: + vdda-supply: + description: 1.2 V supply properties: compatible: - items: + oneOf: + - items: + - enum: + - qcom,dsi-ctrl-v2-apq8064 + - qcom,dsi-ctrl-6g-v1.0.0 + - qcom,dsi-ctrl-6g-v1.1.0 + - qcom,dsi-ctrl-6g-v1.1.1 + - qcom,dsi-ctrl-6g-v1.2.0 + - qcom,dsi-ctrl-6g-v1.3.0 + - qcom,dsi-ctrl-6g-v1.3.1 + - qcom,dsi-ctrl-6g-v1.4.1 + - qcom,dsi-ctrl-6g-v1.4.2 + - qcom,dsi-ctrl-6g-v2.1.0 + - qcom,dsi-ctrl-6g-v2.2.0 + - qcom,dsi-ctrl-6g-v2.2.1 + - qcom,dsi-ctrl-6g-v2.3.0 + - qcom,dsi-ctrl-6g-v2.4.0 + - qcom,dsi-ctrl-6g-v2.4.1 + - qcom,dsi-ctrl-6g-v2.5.0 + - const: qcom,mdss-dsi-ctrl + - const: qcom,mdss-dsi-ctrl + deprecated: true reg: maxItems: 1 @@ -26,23 +242,13 @@ properties: interrupts: maxItems: 1 - clocks: - items: - - description: Display byte clock - - description: Display byte interface clock - - description: Display pixel clock - - description: Display escape clock - - description: Display AHB clock - - description: Display AXI clock - - clock-names: - items: - - const: byte - - const: byte_intf - - const: pixel - - const: core - - const: iface - - const: bus + clocks: true + + clock-names: true + + assigned-clocks: true + + assigned-clock-parents: true phys: maxItems: 1 @@ -54,28 +260,12 @@ properties: "#size-cells": true - syscon-sfpb: - description: A phandle to mmss_sfpb syscon node (only for DSIv2). - $ref: "/schemas/types.yaml#/definitions/phandle" - qcom,dual-dsi-mode: type: boolean - description: | + description: > Indicates if the DSI controller is driving a panel which needs 2 DSI links. - assigned-clocks: - minItems: 2 - maxItems: 2 - description: | - Parents of "byte" and "pixel" for the given platform. - - assigned-clock-parents: - minItems: 2 - maxItems: 2 - description: | - The Byte clock and Pixel clock PLL outputs provided by a DSI PHY block. - power-domains: maxItems: 1 @@ -102,7 +292,7 @@ properties: maxItems: 4 minItems: 4 items: - enum: [ 0, 1, 2, 3 ] + enum: [0, 1, 2, 3] port@1: $ref: "/schemas/graph.yaml#/$defs/port-base" @@ -118,7 +308,7 @@ properties: maxItems: 4 minItems: 4 items: - enum: [ 0, 1, 2, 3 ] + enum: [0, 1, 2, 3] required: - port@0 @@ -135,11 +325,9 @@ required: - phy-names - assigned-clocks - assigned-clock-parents - - power-domains - - operating-points-v2 - ports -additionalProperties: false +unevaluatedProperties: false examples: - | @@ -175,7 +363,8 @@ examples: phys = <&dsi0_phy>; phy-names = "dsi"; - assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>; + assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, + <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>; assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>; power-domains = <&rpmhpd SC7180_CX>;
Update documentation compatible and checking to comprehend both V2 and 6G version bindings. Following this commit, there will be update for compatible string in chipsets dtsi. Additional changes: - switch to unevaluatedProperties Signed-off-by: David Heidelberg <david@ixit.cz> --- Rob, I know you mentioned using rather chipset names, but since meanwhile I coded this, I'll let you decide if should make sense to change it or keep it this way. .../display/msm/dsi-controller-main.yaml | 271 +++++++++++++++--- 1 file changed, 230 insertions(+), 41 deletions(-)