On Thu, Jun 04, 2026 at 06:00:47PM +0530, Nabige Aala wrote: > Shikra SoC uses the same MDSS/DPU/DSI hardware as QCM2290 (DPU 6.5), > sharing the same register layout, DSI controller and 14nm DSI PHY. > Add qcom,shikra-mdss to the qcm2290-mdss binding compatible enum > rather than introducing a separate binding file. > > Register qcom,shikra-dsi-ctrl in dsi-controller-main.yaml alongside > qcom,qcm2290-dsi-ctrl, and update the qcm2290-mdss patternProperties > to accept both SoC-specific DPU and DSI controller compatibles. > > Signed-off-by: Nabige Aala <[email protected]> > --- > .../bindings/display/msm/dsi-controller-main.yaml | 1 + > .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 7 ++-- > .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 38 > ++++++++++++++++++---- > 3 files changed, 37 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..a2f3e91104af 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -33,6 +33,7 @@ properties: > - qcom,sdm660-dsi-ctrl > - qcom,sdm670-dsi-ctrl > - qcom,sdm845-dsi-ctrl > + - qcom,shikra-dsi-ctrl
It is the same as QCM2290. Why didn't you follow the pattern and add it using qcm2290 one as a fallback? > - qcom,sm6115-dsi-ctrl > - qcom,sm6125-dsi-ctrl > - qcom,sm6150-dsi-ctrl > 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..7184b09a8774 100644 > --- a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml > +++ b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml > @@ -4,21 +4,36 @@ > $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]> > + - Nabige Aala <[email protected]> Nope. > > 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# > > +select: > + properties: > + compatible: > + contains: > + enum: > + - qcom,qcm2290-mdss > + required: > + - compatible Why do you need this? > + > properties: > compatible: > - const: qcom,qcm2290-mdss > + oneOf: > + - const: qcom,qcm2290-mdss > + - items: > + - const: qcom,shikra-mdss > + - const: qcom,qcm2290-mdss > > clocks: > items: > @@ -52,7 +67,11 @@ patternProperties: > > properties: > compatible: > - const: qcom,qcm2290-dpu > + oneOf: > + - const: qcom,qcm2290-dpu > + - items: > + - const: qcom,shikra-dpu > + - const: qcom,qcm2290-dpu > > "^dsi@[0-9a-f]+$": > type: object > @@ -60,9 +79,14 @@ patternProperties: > > properties: > compatible: > - items: > - - const: qcom,qcm2290-dsi-ctrl > - - const: qcom,mdss-dsi-ctrl > + oneOf: > + - items: > + - const: qcom,qcm2290-dsi-ctrl > + - const: qcom,mdss-dsi-ctrl > + - items: > + - const: qcom,shikra-dsi-ctrl > + - const: qcom,qcm2290-dsi-ctrl > + - const: qcom,mdss-dsi-ctrl Change this to contains:qcom,qcm2290-dsi-ctrl > > "^phy@[0-9a-f]+$": > type: object > > -- > 2.34.1 > -- With best wishes Dmitry
