On 12/07/2022 14:44, Stephan Gerhold wrote: > The "qcom,msm8974-mss-pil" binding is still similar enough to MSM8916 > to be covered by the same DT schema. The only difference is the > additional "mss-supply", which can be easily handled using a single > if statement. > > Signed-off-by: Stephan Gerhold <stephan.gerhold@xxxxxxxxxxxxxxx> > --- > Note: I generated this patch on top of Sibi's series [1] to avoid > conflicts later (I expect it will be picked up first). > > [1]: https://lore.kernel.org/linux-arm-msm/1657020721-24939-1-git-send-email-quic_sibis@xxxxxxxxxxx/ > --- > .../remoteproc/qcom,msm8916-mss-pil.yaml | 16 ++++++++++++++++ > .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 16 ---------------- > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml > index 3968348dc982..ca7146551ba9 100644 > --- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml > +++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml > @@ -18,6 +18,7 @@ properties: > oneOf: > - enum: > - qcom,msm8916-mss-pil > + - qcom,msm8974-mss-pil > > - const: qcom,q6v5-pil > description: Deprecated, prefer using qcom,msm8916-mss-pil > @@ -76,6 +77,9 @@ properties: > pll-supply: > description: PLL proxy supply (control handed over after startup) > > + mss-supply: > + description: MSS power domain supply (only valid for qcom,msm8974-mss-pil) > + > resets: > items: > - description: MSS restart control > @@ -177,6 +181,18 @@ required: > - qcom,smem-state-names > - smd-edge > > +# mss-supply is only valid (and required) for MSM8974 > +if: Put it under allOf. This makes it prepared for growing. > + properties: > + compatible: > + const: qcom,msm8974-mss-pil > +then: > + required: > + - mss-supply > +else: > + properties: > + mss-supply: false > + Best regards, Krzysztof
