On 20/12/2022 13:36, Bryan O'Donoghue wrote: > Deprecate qcom,dsi-ctrl-6g-qcm2290 in favour of the desired format > qcom,qcm2290-dsi-ctrl. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx> > --- > .../display/msm/dsi-controller-main.yaml | 36 +++++++++++-------- > 1 file changed, 21 insertions(+), 15 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > index 01afa9e9c4b3c..98d54a7ee28d4 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -14,21 +14,27 @@ allOf: > > properties: > compatible: > - 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,dsi-ctrl-6g-qcm2290 > - - 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 > + oneOf: > + - 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 > + - items: I would just squash it with previous. You are adding some code and in next patch immediately: 1. re-indent it, 2. remove it (qcom,dsi-ctrl-6g-qcm2290) Best regards, Krzysztof
