diff options
| author | Linaro CI <ci_notify@linaro.org> | 2023-01-05 18:08:58 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2023-01-05 18:08:58 +0000 |
| commit | d3c760c0797ebbf593769e44c41d76bf147d63d5 (patch) | |
| tree | 78916e0f5ab3fee2e9202e8333cffc796321539a /Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | |
| parent | ac851f27c446fa8a065e954e0dba9901640b9e52 (diff) | |
| parent | a0bcf59d5a883bf1ea5b4adc4b384dc6c71b5c19 (diff) | |
Merge remote-tracking branch 'msm8939/tracking-qcomlt-msm8939' into integration-linux-qcomltintegration-linux-qcomlt-20230108-171912-v6.2-rc2-459-gd3c760c0797eb
# Conflicts:
# Documentation/devicetree/bindings/arm/qcom.yaml
# arch/arm64/boot/dts/qcom/Makefile
Diffstat (limited to 'Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 12 |
1 files 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 6a9c96f0352a..1bc412a4ac5e 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 |