| Message ID | 20221223021025.1646636-8-bryan.odonoghue@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | mdss-dsi-ctrl binding and dts fixes | expand |
On Fri, Dec 23, 2022 at 02:10:14AM +0000, Bryan O'Donoghue wrote: > Add the list of current compats absent the deprecated qcm2290 to the list > of dsi compats listed here. > > Several MDSS yaml files exist which document the dsi sub-node. > For each existing SoC MDSS yaml, provide the right dsi compat string. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > .../bindings/display/msm/qcom,mdss.yaml | 16 +++++++++++++++- > .../bindings/display/msm/qcom,msm8998-mdss.yaml | 8 +++++--- > .../bindings/display/msm/qcom,sc7180-mdss.yaml | 6 ++++-- > .../bindings/display/msm/qcom,sc7280-mdss.yaml | 6 ++++-- > .../bindings/display/msm/qcom,sdm845-mdss.yaml | 8 +++++--- > .../bindings/display/msm/qcom,sm8250-mdss.yaml | 8 +++++--- > 6 files changed, 38 insertions(+), 14 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml > index ba0460268731b..86bb43489bf4a 100644 > --- a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml > +++ b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml > @@ -94,7 +94,21 @@ patternProperties: > type: object > properties: > compatible: > - const: qcom,mdss-dsi-ctrl > + items: > + - enum: > + - qcom,apq8064-dsi-ctrl > + - qcom,msm8916-dsi-ctrl > + - qcom,msm8953-dsi-ctrl > + - qcom,msm8974-dsi-ctrl > + - qcom,msm8996-dsi-ctrl > + - qcom,msm8998-dsi-ctrl > + - qcom,qcm2290-dsi-ctrl > + - qcom,sc7180-dsi-ctrl > + - qcom,sc7280-dsi-ctrl > + - qcom,sdm660-dsi-ctrl > + - qcom,sdm845-dsi-ctrl > + - qcom,sm8250-dsi-ctrl > + - const: qcom,mdss-dsi-ctrl No need to have an exact match here. Just this is enough: compatible: contains: const: qcom,mdss-dsi-ctrl Then the DSI schema will check the rest. Same for the rest. Rob
On 04/01/2023 02:29, Rob Herring wrote: > On Fri, Dec 23, 2022 at 02:10:14AM +0000, Bryan O'Donoghue wrote: >> Add the list of current compats absent the deprecated qcm2290 to the list >> of dsi compats listed here. >> >> Several MDSS yaml files exist which document the dsi sub-node. >> For each existing SoC MDSS yaml, provide the right dsi compat string. >> >> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> >> --- >> .../bindings/display/msm/qcom,mdss.yaml | 16 +++++++++++++++- >> .../bindings/display/msm/qcom,msm8998-mdss.yaml | 8 +++++--- >> .../bindings/display/msm/qcom,sc7180-mdss.yaml | 6 ++++-- >> .../bindings/display/msm/qcom,sc7280-mdss.yaml | 6 ++++-- >> .../bindings/display/msm/qcom,sdm845-mdss.yaml | 8 +++++--- >> .../bindings/display/msm/qcom,sm8250-mdss.yaml | 8 +++++--- >> 6 files changed, 38 insertions(+), 14 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml >> index ba0460268731b..86bb43489bf4a 100644 >> --- a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml >> +++ b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml >> @@ -94,7 +94,21 @@ patternProperties: >> type: object >> properties: >> compatible: >> - const: qcom,mdss-dsi-ctrl >> + items: >> + - enum: >> + - qcom,apq8064-dsi-ctrl >> + - qcom,msm8916-dsi-ctrl >> + - qcom,msm8953-dsi-ctrl >> + - qcom,msm8974-dsi-ctrl >> + - qcom,msm8996-dsi-ctrl >> + - qcom,msm8998-dsi-ctrl >> + - qcom,qcm2290-dsi-ctrl >> + - qcom,sc7180-dsi-ctrl >> + - qcom,sc7280-dsi-ctrl >> + - qcom,sdm660-dsi-ctrl >> + - qcom,sdm845-dsi-ctrl >> + - qcom,sm8250-dsi-ctrl >> + - const: qcom,mdss-dsi-ctrl > > No need to have an exact match here. Just this is enough: > > compatible: > contains: > const: qcom,mdss-dsi-ctrl > > Then the DSI schema will check the rest. I think the intent here should have been to list DSI variants usable with the qcom,mdss device. But then the list should be shortened a bit. E.g. apq8064 is pre-MDSS and sc7180/7280 and sm8250 are used with qcom,SoC-mdss devices rather than just qcom,mdss. > Same for the rest. > > Rob
diff --git a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml index ba0460268731b..86bb43489bf4a 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml @@ -94,7 +94,21 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - enum: + - qcom,apq8064-dsi-ctrl + - qcom,msm8916-dsi-ctrl + - qcom,msm8953-dsi-ctrl + - qcom,msm8974-dsi-ctrl + - qcom,msm8996-dsi-ctrl + - qcom,msm8998-dsi-ctrl + - qcom,qcm2290-dsi-ctrl + - qcom,sc7180-dsi-ctrl + - qcom,sc7280-dsi-ctrl + - qcom,sdm660-dsi-ctrl + - qcom,sdm845-dsi-ctrl + - qcom,sm8250-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[1-9a-f][0-9a-f]*$": type: object diff --git a/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml index cf52ff77a41aa..692b60af946f0 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml @@ -47,7 +47,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,msm8998-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -126,7 +128,7 @@ examples: }; dsi@c994000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,msm8998-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0c994000 0x400>; reg-names = "dsi_ctrl"; @@ -196,7 +198,7 @@ examples: }; dsi@c996000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,msm8998-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0c996000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml index 13e396d61a512..e72190040ca05 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml @@ -59,7 +59,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sc7180-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -142,7 +144,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sc7180-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml index a3de1744ba119..8997e24f804eb 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml @@ -58,7 +58,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sc7280-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^edp@[0-9a-f]+$": type: object @@ -162,7 +164,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sc7280-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml index 31ca6f99fc223..b5446671f3adf 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml @@ -51,7 +51,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sdm845-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -128,7 +130,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sdm845-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; @@ -198,7 +200,7 @@ examples: }; dsi@ae96000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sdm845-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae96000 0x400>; reg-names = "dsi_ctrl"; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml index 0d3be5386b3f4..d093f73e02dc3 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml @@ -55,7 +55,9 @@ patternProperties: type: object properties: compatible: - const: qcom,mdss-dsi-ctrl + items: + - const: qcom,sm8250-dsi-ctrl + - const: qcom,mdss-dsi-ctrl "^phy@[0-9a-f]+$": type: object @@ -167,7 +169,7 @@ examples: }; dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8250-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae94000 0x400>; reg-names = "dsi_ctrl"; @@ -257,7 +259,7 @@ examples: }; dsi@ae96000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8250-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0ae96000 0x400>; reg-names = "dsi_ctrl";
Add the list of current compats absent the deprecated qcm2290 to the list of dsi compats listed here. Several MDSS yaml files exist which document the dsi sub-node. For each existing SoC MDSS yaml, provide the right dsi compat string. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- .../bindings/display/msm/qcom,mdss.yaml | 16 +++++++++++++++- .../bindings/display/msm/qcom,msm8998-mdss.yaml | 8 +++++--- .../bindings/display/msm/qcom,sc7180-mdss.yaml | 6 ++++-- .../bindings/display/msm/qcom,sc7280-mdss.yaml | 6 ++++-- .../bindings/display/msm/qcom,sdm845-mdss.yaml | 8 +++++--- .../bindings/display/msm/qcom,sm8250-mdss.yaml | 8 +++++--- 6 files changed, 38 insertions(+), 14 deletions(-)