On Fri, Jun 05, 2026 at 03:48:51PM +0530, Nabige Aala wrote: > Shikra reuses the same MDSS/DPU 6.5 hardware as QCM2290. Extend > the existing qcm2290 bindings to cover Shikra by adding fallback > compatible chains for MDSS, DPU and DSI controller nodes rather > than introducing a separate binding file. > > Signed-off-by: Nabige Aala <[email protected]> > --- > .../bindings/display/msm/dsi-controller-main.yaml | 4 ++++ > .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 7 +++++-- > .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 22 > +++++++++++++++------- > 3 files changed, 24 insertions(+), 9 deletions(-) > > diff --git > a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > index dbc0613e427e..ab2cfd6d6e3e 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -57,6 +57,10 @@ properties: > - const: qcom,eliza-dsi-ctrl > - const: qcom,sm8750-dsi-ctrl > - const: qcom,mdss-dsi-ctrl > + - items: > + - const: qcom,shikra-dsi-ctrl > + - const: qcom,qcm2290-dsi-ctrl > + - const: qcom,mdss-dsi-ctrl
Wrong sort order, qcm2290 < sm8750 > - enum: > - qcom,dsi-ctrl-6g-qcm2290 > - qcom,mdss-dsi-ctrl # This should always come with an > SoC-specific compatible > diff --git > a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml > b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml > index be6cd8adb3b6..e166a73651df 100644 > --- a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml > +++ b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml > @@ -13,8 +13,11 @@ $ref: /schemas/display/msm/dpu-common.yaml# > > properties: > compatible: > - const: qcom,qcm2290-dpu > - > + oneOf: > + - const: qcom,qcm2290-dpu > + - items: > + - const: qcom,shikra-dpu > + - const: qcom,qcm2290-dpu > reg: > items: > - description: Address offset and size for mdp register set > diff --git > a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml > b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml > index bb09ecd1a5b4..ef21b2c263f2 100644 > --- a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml > +++ b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml > @@ -4,7 +4,7 @@ > $id: http://devicetree.org/schemas/display/msm/qcom,qcm2290-mdss.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Qualcomm QCM220 Display MDSS > +title: Qualcomm QCM2290 and Shikra Display MDSS > > maintainers: > - Loic Poulain <[email protected]> > @@ -12,13 +12,18 @@ maintainers: > description: > Device tree bindings for MSM Mobile Display Subsystem(MDSS) that > encapsulates > sub-blocks like DPU display controller and DSI. Device tree bindings of > MDSS > - are mentioned for QCM2290 target. > + are mentioned for QCM2290 and Shikra targets. Shikra uses the same > MDSS/DPU/DSI > + hardware as QCM2290 (DPU 6.5) and shares the same register layout. > > $ref: /schemas/display/msm/mdss-common.yaml# > > properties: > compatible: > - const: qcom,qcm2290-mdss > + oneOf: > + - const: qcom,qcm2290-mdss > + - items: > + - const: qcom,shikra-mdss > + - const: qcom,qcm2290-mdss > > clocks: > items: > @@ -52,7 +57,11 @@ patternProperties: > > properties: > compatible: > - const: qcom,qcm2290-dpu > + oneOf: > + - const: qcom,qcm2290-dpu > + - items: > + - const: qcom,shikra-dpu > + - const: qcom,qcm2290-dpu Use contains: > > "^dsi@[0-9a-f]+$": > type: object > @@ -60,9 +69,8 @@ patternProperties: > > properties: > compatible: > - items: > - - const: qcom,qcm2290-dsi-ctrl > - - const: qcom,mdss-dsi-ctrl > + contains: > + const: qcom,qcm2290-dsi-ctrl > > "^phy@[0-9a-f]+$": > type: object > > -- > 2.34.1 > -- With best wishes Dmitry
