| Message ID | 20231205030114.1349089-2-kyletso@google.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mutiple selectable capabilities in tcpm | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 124 lines checked |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On Tue, Dec 05, 2023 at 11:01:13AM +0800, Kyle Tso wrote: > Commit 662a60102c12 ("usb: typec: Separate USB Power Delivery from USB > Type-C") allows userspace to configure the PD of a port by selecting > different set of predefined PD capabilities. Define the PD capability > sets in DT for better configurability in device modules. > > Define an optional child node "capabilities" to contain multiple USB > Power Delivery capabilities. > > Define child nodes with pattern (e.g. caps-0, caps-1) under > "capabilities". Each node contains PDO data of a selectable Power > Delivery capability. > > Also define common properties for source-pdos, sink-pdos, and > op-sink-microwatt that can be referenced. > > Signed-off-by: Kyle Tso <kyletso@google.com> > --- > v4 -> v5: > - Fixed DT_CHECK errors > > .../bindings/connector/usb-connector.yaml | 88 +++++++++++++------ > 1 file changed, 59 insertions(+), 29 deletions(-) > > diff --git a/Documentation/devicetree/bindings/connector/usb-connector.yaml b/Documentation/devicetree/bindings/connector/usb-connector.yaml > index 7c8a3e8430d3..7945d09d1f59 100644 > --- a/Documentation/devicetree/bindings/connector/usb-connector.yaml > +++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml > @@ -14,6 +14,8 @@ description: > of a USB interface controller or a separate node when it is attached to both > MUX and USB interface controller. > > +$ref: "#/$defs/capabilities" > + > properties: > compatible: > oneOf: > @@ -67,6 +69,15 @@ properties: > model it as a regulator. See bindings/regulator/fixed-regulator.yaml > > # The following are optional properties for "usb-c-connector". > + source-pdos: > + $ref: "#/$defs/capabilities/properties/source-pdos" > + > + sink-pdos: > + $ref: "#/$defs/capabilities/properties/sink-pdos" > + > + op-sink-microwatt: > + $ref: "#/$defs/capabilities/properties/op-sink-microwatt" With the $ref above, these aren't needed. But you have to use unevaluatedProperties instead of additionalProperties. I fixed this up and applied. Rob
On Sat, Dec 9, 2023 at 12:50 AM Rob Herring <robh@kernel.org> wrote: > > On Tue, Dec 05, 2023 at 11:01:13AM +0800, Kyle Tso wrote: > > Commit 662a60102c12 ("usb: typec: Separate USB Power Delivery from USB > > Type-C") allows userspace to configure the PD of a port by selecting > > different set of predefined PD capabilities. Define the PD capability > > sets in DT for better configurability in device modules. > > > > Define an optional child node "capabilities" to contain multiple USB > > Power Delivery capabilities. > > > > Define child nodes with pattern (e.g. caps-0, caps-1) under > > "capabilities". Each node contains PDO data of a selectable Power > > Delivery capability. > > > > Also define common properties for source-pdos, sink-pdos, and > > op-sink-microwatt that can be referenced. > > > > Signed-off-by: Kyle Tso <kyletso@google.com> > > --- > > v4 -> v5: > > - Fixed DT_CHECK errors > > > > .../bindings/connector/usb-connector.yaml | 88 +++++++++++++------ > > 1 file changed, 59 insertions(+), 29 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/connector/usb-connector.yaml b/Documentation/devicetree/bindings/connector/usb-connector.yaml > > index 7c8a3e8430d3..7945d09d1f59 100644 > > --- a/Documentation/devicetree/bindings/connector/usb-connector.yaml > > +++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml > > @@ -14,6 +14,8 @@ description: > > of a USB interface controller or a separate node when it is attached to both > > MUX and USB interface controller. > > > > +$ref: "#/$defs/capabilities" > > + > > properties: > > compatible: > > oneOf: > > @@ -67,6 +69,15 @@ properties: > > model it as a regulator. See bindings/regulator/fixed-regulator.yaml > > > > # The following are optional properties for "usb-c-connector". > > + source-pdos: > > + $ref: "#/$defs/capabilities/properties/source-pdos" > > + > > + sink-pdos: > > + $ref: "#/$defs/capabilities/properties/sink-pdos" > > + > > + op-sink-microwatt: > > + $ref: "#/$defs/capabilities/properties/op-sink-microwatt" > > With the $ref above, these aren't needed. But you have to use > unevaluatedProperties instead of additionalProperties. > > I fixed this up and applied. > > Rob Thank you, Rob! -- Kyle
diff --git a/Documentation/devicetree/bindings/connector/usb-connector.yaml b/Documentation/devicetree/bindings/connector/usb-connector.yaml index 7c8a3e8430d3..7945d09d1f59 100644 --- a/Documentation/devicetree/bindings/connector/usb-connector.yaml +++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml @@ -14,6 +14,8 @@ description: of a USB interface controller or a separate node when it is attached to both MUX and USB interface controller. +$ref: "#/$defs/capabilities" + properties: compatible: oneOf: @@ -67,6 +69,15 @@ properties: model it as a regulator. See bindings/regulator/fixed-regulator.yaml # The following are optional properties for "usb-c-connector". + source-pdos: + $ref: "#/$defs/capabilities/properties/source-pdos" + + sink-pdos: + $ref: "#/$defs/capabilities/properties/sink-pdos" + + op-sink-microwatt: + $ref: "#/$defs/capabilities/properties/op-sink-microwatt" + power-role: description: Determines the power role that the Type C connector will support. "dual" refers to Dual Role Port (DRP). @@ -119,30 +130,6 @@ properties: # The following are optional properties for "usb-c-connector" with power # delivery support. - source-pdos: - description: An array of u32 with each entry providing supported power - source data object(PDO), the detailed bit definitions of PDO can be found - in "Universal Serial Bus Power Delivery Specification" chapter 6.4.1.2 - Source_Capabilities Message, the order of each entry(PDO) should follow - the PD spec chapter 6.4.1. Required for power source and power dual role. - User can specify the source PDO array via PDO_FIXED/BATT/VAR/PPS_APDO() - defined in dt-bindings/usb/pd.h. - minItems: 1 - maxItems: 7 - $ref: /schemas/types.yaml#/definitions/uint32-array - - sink-pdos: - description: An array of u32 with each entry providing supported power sink - data object(PDO), the detailed bit definitions of PDO can be found in - "Universal Serial Bus Power Delivery Specification" chapter 6.4.1.3 - Sink Capabilities Message, the order of each entry(PDO) should follow the - PD spec chapter 6.4.1. Required for power sink and power dual role. User - can specify the sink PDO array via PDO_FIXED/BATT/VAR/PPS_APDO() defined - in dt-bindings/usb/pd.h. - minItems: 1 - maxItems: 7 - $ref: /schemas/types.yaml#/definitions/uint32-array - sink-vdos: description: An array of u32 with each entry, a Vendor Defined Message Object (VDO), providing additional information corresponding to the product, the detailed bit @@ -166,11 +153,6 @@ properties: maxItems: 6 $ref: /schemas/types.yaml#/definitions/uint32-array - op-sink-microwatt: - description: Sink required operating power in microwatt, if source can't - offer the power, Capability Mismatch is set. Required for power sink and - power dual role. - port: $ref: /schemas/graph.yaml#/properties/port description: OF graph bindings modeling a data bus to the connector, e.g. @@ -231,6 +213,20 @@ properties: SNK_READY for non-pd link. type: boolean + capabilities: + description: A child node to contain all the selectable USB Power Delivery capabilities. + type: object + + patternProperties: + "^caps-[0-9]+$": + description: Child nodes under "capabilities" node. Each node contains a selectable USB + Power Delivery capability. + type: object + $ref: "#/$defs/capabilities" + unevaluatedProperties: false + + additionalProperties: false + dependencies: sink-vdos-v1: [ sink-vdos ] sink-vdos: [ sink-vdos-v1 ] @@ -238,6 +234,40 @@ dependencies: required: - compatible +$defs: + capabilities: + type: object + + properties: + source-pdos: + description: An array of u32 with each entry providing supported power + source data object(PDO), the detailed bit definitions of PDO can be found + in "Universal Serial Bus Power Delivery Specification" chapter 6.4.1.2 + Source_Capabilities Message, the order of each entry(PDO) should follow + the PD spec chapter 6.4.1. Required for power source and power dual role. + User can specify the source PDO array via PDO_FIXED/BATT/VAR/PPS_APDO() + defined in dt-bindings/usb/pd.h. + minItems: 1 + maxItems: 7 + $ref: /schemas/types.yaml#/definitions/uint32-array + + sink-pdos: + description: An array of u32 with each entry providing supported power sink + data object(PDO), the detailed bit definitions of PDO can be found in + "Universal Serial Bus Power Delivery Specification" chapter 6.4.1.3 + Sink Capabilities Message, the order of each entry(PDO) should follow the + PD spec chapter 6.4.1. Required for power sink and power dual role. User + can specify the sink PDO array via PDO_FIXED/BATT/VAR/PPS_APDO() defined + in dt-bindings/usb/pd.h. + minItems: 1 + maxItems: 7 + $ref: /schemas/types.yaml#/definitions/uint32-array + + op-sink-microwatt: + description: Sink required operating power in microwatt, if source can't + offer the power, Capability Mismatch is set. Required for power sink and + power dual role. + allOf: - if: properties:
Commit 662a60102c12 ("usb: typec: Separate USB Power Delivery from USB Type-C") allows userspace to configure the PD of a port by selecting different set of predefined PD capabilities. Define the PD capability sets in DT for better configurability in device modules. Define an optional child node "capabilities" to contain multiple USB Power Delivery capabilities. Define child nodes with pattern (e.g. caps-0, caps-1) under "capabilities". Each node contains PDO data of a selectable Power Delivery capability. Also define common properties for source-pdos, sink-pdos, and op-sink-microwatt that can be referenced. Signed-off-by: Kyle Tso <kyletso@google.com> --- v4 -> v5: - Fixed DT_CHECK errors .../bindings/connector/usb-connector.yaml | 88 +++++++++++++------ 1 file changed, 59 insertions(+), 29 deletions(-)