| Message ID | 20220701100405.3586820-1-bryan.odonoghue@linaro.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v2] dt-bindings: pm8941-misc: Fix usb_id and usb_vbus definitions | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 18 lines checked |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On Fri, 01 Jul 2022 11:04:05 +0100, Bryan O'Donoghue wrote: > dts validation is throwing an error for me on 8916 and 8939 with > extcon@1300. In that case we have usb_vbus but not usb_id. > > It wasn't immediately obvious if there was a valid use-case for the > existing code for usb_id in isolation, however discussing further, we > concluded that usb_id, usb_vbus or (usb_id | usb_vbus) are valid > combinations as an external IC may be responsible for usb_id or usb_vbus. > > Expand the definition with anyOf to capture the three different valid > modes. > > Fixes: 4fcdd677c4ea ("bindings: pm8941-misc: Add support for VBUS detection") > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > .../devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
On 2022-07-01 11:04:05, Bryan O'Donoghue wrote: > dts validation is throwing an error for me on 8916 and 8939 with > extcon@1300. In that case we have usb_vbus but not usb_id. > > It wasn't immediately obvious if there was a valid use-case for the > existing code for usb_id in isolation, however discussing further, we > concluded that usb_id, usb_vbus or (usb_id | usb_vbus) are valid > combinations as an external IC may be responsible for usb_id or usb_vbus. > > Expand the definition with anyOf to capture the three different valid > modes. > > Fixes: 4fcdd677c4ea ("bindings: pm8941-misc: Add support for VBUS detection") > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> Can you also switch platform_get_irq_byname() to platform_get_irq_byname_optional(), to get rid of: [ 1.377491] extcon-pm8941-misc 200f000.spmi:pmic@2:extcon_chgpth@1300: IRQ usb_id not found [ 1.380399] extcon-pm8941-misc 200f000.spmi:pmic@2:extcon_otg@1100: IRQ usb_vbus not found That'd compement this patch nicely. - Marijn > --- > .../devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml > index 6a9c96f0352ac..1bc412a4ac5e6 100644 > --- a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml > +++ b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml > @@ -27,10 +27,14 @@ properties: > > interrupt-names: > minItems: 1 > - items: > - - const: usb_id > - - const: usb_vbus > - > + anyOf: > + - items: > + - const: usb_id > + - const: usb_vbus > + - items: > + - const: usb_id > + - items: > + - const: usb_vbus > required: > - compatible > - reg > -- > 2.36.1 >
diff --git a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml index 6a9c96f0352ac..1bc412a4ac5e6 100644 --- a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml +++ b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml @@ -27,10 +27,14 @@ properties: interrupt-names: minItems: 1 - items: - - const: usb_id - - const: usb_vbus - + anyOf: + - items: + - const: usb_id + - const: usb_vbus + - items: + - const: usb_id + - items: + - const: usb_vbus required: - compatible - reg
dts validation is throwing an error for me on 8916 and 8939 with extcon@1300. In that case we have usb_vbus but not usb_id. It wasn't immediately obvious if there was a valid use-case for the existing code for usb_id in isolation, however discussing further, we concluded that usb_id, usb_vbus or (usb_id | usb_vbus) are valid combinations as an external IC may be responsible for usb_id or usb_vbus. Expand the definition with anyOf to capture the three different valid modes. Fixes: 4fcdd677c4ea ("bindings: pm8941-misc: Add support for VBUS detection") Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- .../devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)