| Message ID | 20230307-topic-dsi_qcm-v4-9-54b4898189cb@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix DSI host idx detection on HW revision clash | expand |
On 2023-03-14 13:13:47, Konrad Dybcio wrote: > Add a compatible for the DSI on SM6115. > > Acked-by: Rob Herring <robh@kernel.org> > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Example is nice and tidy now, thanks! Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 ++ > .../devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml | 10 ++++++++-- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > index 94f4cdf88c95..d534451c8f7f 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -25,6 +25,7 @@ properties: > - qcom,sc7280-dsi-ctrl > - qcom,sdm660-dsi-ctrl > - qcom,sdm845-dsi-ctrl > + - qcom,sm6115-dsi-ctrl > - qcom,sm8150-dsi-ctrl > - qcom,sm8250-dsi-ctrl > - qcom,sm8350-dsi-ctrl > @@ -351,6 +352,7 @@ allOf: > contains: > enum: > - qcom,sdm845-dsi-ctrl > + - qcom,sm6115-dsi-ctrl > then: > properties: > clocks: > diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml > index 2491cb100b33..b9f83088f370 100644 > --- a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml > +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml > @@ -40,7 +40,13 @@ patternProperties: > type: object > properties: > compatible: > - const: qcom,dsi-ctrl-6g-qcm2290 > + oneOf: > + - items: > + - const: qcom,sm6115-dsi-ctrl > + - const: qcom,mdss-dsi-ctrl > + - description: Old binding, please don't use > + deprecated: true > + const: qcom,dsi-ctrl-6g-qcm2290 > > "^phy@[0-9a-f]+$": > type: object > @@ -114,7 +120,7 @@ examples: > }; > > dsi@5e94000 { > - compatible = "qcom,dsi-ctrl-6g-qcm2290"; > + compatible = "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl"; > reg = <0x05e94000 0x400>; > reg-names = "dsi_ctrl"; > > > -- > 2.39.2 >
diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 94f4cdf88c95..d534451c8f7f 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -25,6 +25,7 @@ properties: - qcom,sc7280-dsi-ctrl - qcom,sdm660-dsi-ctrl - qcom,sdm845-dsi-ctrl + - qcom,sm6115-dsi-ctrl - qcom,sm8150-dsi-ctrl - qcom,sm8250-dsi-ctrl - qcom,sm8350-dsi-ctrl @@ -351,6 +352,7 @@ allOf: contains: enum: - qcom,sdm845-dsi-ctrl + - qcom,sm6115-dsi-ctrl then: properties: clocks: diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml index 2491cb100b33..b9f83088f370 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml @@ -40,7 +40,13 @@ patternProperties: type: object properties: compatible: - const: qcom,dsi-ctrl-6g-qcm2290 + oneOf: + - items: + - const: qcom,sm6115-dsi-ctrl + - const: qcom,mdss-dsi-ctrl + - description: Old binding, please don't use + deprecated: true + const: qcom,dsi-ctrl-6g-qcm2290 "^phy@[0-9a-f]+$": type: object @@ -114,7 +120,7 @@ examples: }; dsi@5e94000 { - compatible = "qcom,dsi-ctrl-6g-qcm2290"; + compatible = "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x05e94000 0x400>; reg-names = "dsi_ctrl";