Commit 8f8986e9 authored by Thierry Reding's avatar Thierry Reding Committed by Rob Herring
Browse files

dt-bindings: Merge gpio-usb-b-connector with usb-connector 



The binding for usb-connector is a superset of gpio-usb-b-connector. One
major difference is that gpio-usb-b-connector requires at least one of
the vbus-gpios and id-gpios properties to be specified. Merge the two
bindings by adding the compatible string combination for the GPIO USB-B
variant and an extra conditional for the required properties list to the
usb-connector.yaml file.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 41a05388

Documentation/devicetree/bindings/connector/usb-connector.yaml

+35 −4
Original line number Diff line number Diff line
@@ -15,11 +15,16 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - usb-a-connector

          - usb-b-connector

          - usb-c-connector



      - items:

          - const: gpio-usb-b-connector

          - const: usb-b-connector



  label:

    description: Symbolic name for the connector.
@@ -140,6 +145,19 @@ properties: 
required:

  - compatible



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: gpio-usb-b-connector

    then:

      anyOf:

        - required:

            - vbus-gpios

        - required:

            - id-gpios



examples:

  # Micro-USB connector with HS lines routed via controller (MUIC).

  - |
@@ -202,3 +220,16 @@ examples: 
        op-sink-microwatt = <10000000>;

      };

    };



  # USB connector with GPIO control lines

  - |

    #include <dt-bindings/gpio/gpio.h>



    usb {

      connector {

        compatible = "gpio-usb-b-connector", "usb-b-connector";

        type = "micro";

        id-gpios = <&pio 12 GPIO_ACTIVE_HIGH>;

        vbus-supply = <&usb_p0_vbus>;

      };

    };

Documentation/devicetree/bindings/usb/usb-conn-gpio.txt

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
USB GPIO Based Connection Detection



This is typically used to switch dual role mode from the USB ID pin connected

to an input GPIO, and also used to enable/disable device mode from the USB

Vbus pin connected to an input GPIO.



Required properties:

- compatible : should include "gpio-usb-b-connector" and "usb-b-connector".

- id-gpios, vbus-gpios : input gpios, either one of them must be present,

	and both can be present as well.

	see connector/usb-connector.yaml



Optional properties:

- vbus-supply : can be present if needed when supports dual role mode.

	see connector/usb-connector.yaml



- Sub-nodes:

	- port : can be present.

		see graph.txt



Example:



&mtu3 {

	connector {

		compatible = "gpio-usb-b-connector", "usb-b-connector";

		type = "micro";

		id-gpios = <&pio 12 GPIO_ACTIVE_HIGH>;

		vbus-supply = <&usb_p0_vbus>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE