diff options
| author | Linaro CI <ci_notify@linaro.org> | 2023-04-26 13:36:23 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2023-04-26 13:36:23 +0000 |
| commit | 0cbce2f2a7c7ca2306237779fd347652e95435c2 (patch) | |
| tree | 54b901661ce8af0a6ad909a78463b9f914d22686 /Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | |
| parent | 180372937c12b16a3d4e1a774578c2c754545905 (diff) | |
| parent | a0bcf59d5a883bf1ea5b4adc4b384dc6c71b5c19 (diff) | |
Merge remote-tracking branch 'msm8939/tracking-qcomlt-msm8939' into integration-linux-qcomlt
# Conflicts:
# Documentation/devicetree/bindings/arm/qcom.yaml
# Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
# arch/arm64/boot/dts/qcom/Makefile
# arch/arm64/boot/dts/qcom/sdm630.dtsi
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 |