| Message ID | 20230815060314.352103-3-quic_fenglinw@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v5,1/3] input: pm8xxx-vib: refactor to easily support new SPMI vibrator | expand |
Hi Fenglin, On Tue Aug 15, 2023 at 8:03 AM CEST, Fenglin Wu wrote: > Add compatible strings to support vibrator module inside PMI632, > PMI7250B, PM7325B, PM7550BA. > > Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com> > --- > .../bindings/input/qcom,pm8xxx-vib.yaml | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml > index c8832cd0d7da..72b72c67a9b6 100644 > --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml > +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml > @@ -11,10 +11,17 @@ maintainers: > > properties: > compatible: > - enum: > - - qcom,pm8058-vib > - - qcom,pm8916-vib > - - qcom,pm8921-vib > + oneOf: > + - enum: > + - qcom,pm8058-vib > + - qcom,pm8916-vib > + - qcom,pm8921-vib > + - items: > + - enum: > + - qcom,pm7250b-vib > + - qcom,pm7325b-vib > + - qcom,pm7550ba-vib > + - const: qcom,pmi632-vib With the new revision the standalone 'compatible = "qcom,pmi632-vib";' doesn't pass validation anymore. foo.dtb: vibrator@5700: compatible: 'oneOf' conditional failed, one must be fixed: ['qcom,pmi632-vib'] is too short 'qcom,pmi632-vib' is not one of ['qcom,pm8058-vib', 'qcom,pm8916-vib', 'qcom,pm8921-vib'] 'qcom,pmi632-vib' is not one of ['qcom,pm7250b-vib', 'qcom,pm7325b-vib', 'qcom,pm7550ba-vib'] from schema $id: http://devicetree.org/schemas/input/qcom,pm8xxx-vib.yaml# I believe you need to add the compatible also like this: diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml index 72b72c67a9b6..2025d6a5423e 100644 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml @@ -16,6 +16,7 @@ properties: - qcom,pm8058-vib - qcom,pm8916-vib - qcom,pm8921-vib + - qcom,pmi632-vib - items: - enum: - qcom,pm7250b-vib Regards Luca > > reg: > maxItems: 1
On 8/15/2023 2:35 PM, Luca Weiss wrote: > Hi Fenglin, > > On Tue Aug 15, 2023 at 8:03 AM CEST, Fenglin Wu wrote: >> Add compatible strings to support vibrator module inside PMI632, >> PMI7250B, PM7325B, PM7550BA. >> >> Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com> >> --- >> .../bindings/input/qcom,pm8xxx-vib.yaml | 15 +++++++++++---- >> 1 file changed, 11 insertions(+), 4 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml >> index c8832cd0d7da..72b72c67a9b6 100644 >> --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml >> +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml >> @@ -11,10 +11,17 @@ maintainers: >> >> properties: >> compatible: >> - enum: >> - - qcom,pm8058-vib >> - - qcom,pm8916-vib >> - - qcom,pm8921-vib >> + oneOf: >> + - enum: >> + - qcom,pm8058-vib >> + - qcom,pm8916-vib >> + - qcom,pm8921-vib >> + - items: >> + - enum: >> + - qcom,pm7250b-vib >> + - qcom,pm7325b-vib >> + - qcom,pm7550ba-vib >> + - const: qcom,pmi632-vib > > With the new revision the standalone 'compatible = "qcom,pmi632-vib";' > doesn't pass validation anymore. > > foo.dtb: vibrator@5700: compatible: 'oneOf' conditional failed, one must be fixed: > ['qcom,pmi632-vib'] is too short > 'qcom,pmi632-vib' is not one of ['qcom,pm8058-vib', 'qcom,pm8916-vib', 'qcom,pm8921-vib'] > 'qcom,pmi632-vib' is not one of ['qcom,pm7250b-vib', 'qcom,pm7325b-vib', 'qcom,pm7550ba-vib'] > from schema $id: http://devicetree.org/schemas/input/qcom,pm8xxx-vib.yaml# > > I believe you need to add the compatible also like this: > > diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml > index 72b72c67a9b6..2025d6a5423e 100644 > --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml > +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml > @@ -16,6 +16,7 @@ properties: > - qcom,pm8058-vib > - qcom,pm8916-vib > - qcom,pm8921-vib > + - qcom,pmi632-vib > - items: > - enum: > - qcom,pm7250b-vib > Yeah, thanks for catching this. I will update it soon. > > Regards > Luca > >> >> reg: >> maxItems: 1 >
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml index c8832cd0d7da..72b72c67a9b6 100644 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml @@ -11,10 +11,17 @@ maintainers: properties: compatible: - enum: - - qcom,pm8058-vib - - qcom,pm8916-vib - - qcom,pm8921-vib + oneOf: + - enum: + - qcom,pm8058-vib + - qcom,pm8916-vib + - qcom,pm8921-vib + - items: + - enum: + - qcom,pm7250b-vib + - qcom,pm7325b-vib + - qcom,pm7550ba-vib + - const: qcom,pmi632-vib reg: maxItems: 1
Add compatible strings to support vibrator module inside PMI632, PMI7250B, PM7325B, PM7550BA. Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com> --- .../bindings/input/qcom,pm8xxx-vib.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)