| Message ID | 20230113063351.24131-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | dt-bindings: display/msm/dsi-phy: drop unused allOf clauses | expand |
On Fri, Jan 13, 2023 at 08:33:51AM +0200, Dmitry Baryshkov wrote: > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../devicetree/bindings/display/msm/dsi-phy-10nm.yaml | 3 +-- > .../devicetree/bindings/display/msm/dsi-phy-14nm.yaml | 3 +-- > .../devicetree/bindings/display/msm/dsi-phy-20nm.yaml | 3 +-- > .../devicetree/bindings/display/msm/dsi-phy-28nm.yaml | 3 +-- > Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml | 3 +-- > 5 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml > index 3ec466c3ab38..71702151bafa 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml > @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 10nm PHY > maintainers: > - Krishna Manikandan <quic_mkrishn@quicinc.com> > > -allOf: > - - $ref: dsi-phy-common.yaml# > +$ref: dsi-phy-common.yaml# Convention is how it was. Partly this is legacy because earlier versions of json-schema required the 'allOf' form or everything in addition to the $ref would be ignored. I left these thinking more than 1 $ref here might be common. But probably more common is a $ref and if/then schemas and I'd somewhat rather keep $ref at the top and if/then schemas at the bottom. So maybe this is the right direction. I don't really care to define one way or the other if we can't enforce it in the meta-schema. I don't need more nits to look for in reviews. Adding a check (i.e. allOf must have 2 or more entries) would be quite invasive and wouldn't allow having 1 entry when we expect a 2nd entry soonish. Rob
On Fri, 13 Jan 2023 at 23:08, Rob Herring <robh@kernel.org> wrote: > > On Fri, Jan 13, 2023 at 08:33:51AM +0200, Dmitry Baryshkov wrote: > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > .../devicetree/bindings/display/msm/dsi-phy-10nm.yaml | 3 +-- > > .../devicetree/bindings/display/msm/dsi-phy-14nm.yaml | 3 +-- > > .../devicetree/bindings/display/msm/dsi-phy-20nm.yaml | 3 +-- > > .../devicetree/bindings/display/msm/dsi-phy-28nm.yaml | 3 +-- > > Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml | 3 +-- > > 5 files changed, 5 insertions(+), 10 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml > > index 3ec466c3ab38..71702151bafa 100644 > > --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml > > +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml > > @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 10nm PHY > > maintainers: > > - Krishna Manikandan <quic_mkrishn@quicinc.com> > > > > -allOf: > > - - $ref: dsi-phy-common.yaml# > > +$ref: dsi-phy-common.yaml# > > Convention is how it was. Partly this is legacy because earlier versions > of json-schema required the 'allOf' form or everything in addition to > the $ref would be ignored. I left these thinking more than 1 $ref here > might be common. But probably more common is a $ref and if/then schemas > and I'd somewhat rather keep $ref at the top and if/then schemas at the > bottom. So maybe this is the right direction. > > I don't really care to define one way or the other if we can't enforce > it in the meta-schema. I don't need more nits to look for in reviews. > Adding a check (i.e. allOf must have 2 or more entries) would be quite > invasive and wouldn't allow having 1 entry when we expect a 2nd entry > soonish. Ack, I'll drop the patch for now then, If I got your message correctly.
diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml index 3ec466c3ab38..71702151bafa 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 10nm PHY maintainers: - Krishna Manikandan <quic_mkrishn@quicinc.com> -allOf: - - $ref: dsi-phy-common.yaml# +$ref: dsi-phy-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml index a43e11d3b00d..cc99946245c6 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 14nm PHY maintainers: - Krishna Manikandan <quic_mkrishn@quicinc.com> -allOf: - - $ref: dsi-phy-common.yaml# +$ref: dsi-phy-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml index 9c1f9140c731..ae4df76835f7 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 20nm PHY maintainers: - Krishna Manikandan <quic_mkrishn@quicinc.com> -allOf: - - $ref: dsi-phy-common.yaml# +$ref: dsi-phy-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml index cf4a338c4661..96c607d7196e 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 28nm PHY maintainers: - Krishna Manikandan <quic_mkrishn@quicinc.com> -allOf: - - $ref: dsi-phy-common.yaml# +$ref: dsi-phy-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml index 78ab8c410ccd..53e2f005d3cf 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml @@ -9,8 +9,7 @@ title: Qualcomm Display DSI 7nm PHY maintainers: - Jonathan Marek <jonathan@marek.ca> -allOf: - - $ref: dsi-phy-common.yaml# +$ref: dsi-phy-common.yaml# properties: compatible:
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- .../devicetree/bindings/display/msm/dsi-phy-10nm.yaml | 3 +-- .../devicetree/bindings/display/msm/dsi-phy-14nm.yaml | 3 +-- .../devicetree/bindings/display/msm/dsi-phy-20nm.yaml | 3 +-- .../devicetree/bindings/display/msm/dsi-phy-28nm.yaml | 3 +-- Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-)