Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions Documentation/devicetree/bindings/phy/apple,combo-phy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ properties:

reg:
minItems: 6
maxItems: 11
maxItems: 12

reg-names:
minItems: 6
maxItems: 11
maxItems: 12

'#phy-cells':
enum: [0, 1]
Expand All @@ -38,8 +38,8 @@ properties:

apple,port-index:
$ref: /schemas/types.yaml#/definitions/uint32
enum: [1, 2, 3, 4, 5]
description: Type-C port; the debug port (0) is excluded
enum: [0, 1, 2, 3, 4, 5]
description: Type-C port, including port zero when handed over to the host

apple,guest-port-reserved:
type: boolean
Expand Down Expand Up @@ -78,9 +78,11 @@ properties:
description:
A combo PHY may name the USB controller's domain fourth ("usb"). Its
USB2 PHY and digital banks are in that domain, and the PHY then holds it
while it runs, also on a port with no USB controller bound.
while it runs, also on a port with no USB controller bound. USB4
DisplayPort tunnel pixel clocks add four clock gates ("dp0" to "dp3"),
held while the corresponding clock runs.
minItems: 3
maxItems: 4
maxItems: 8

power-domain-names:
minItems: 3
Expand All @@ -89,6 +91,10 @@ properties:
- const: common
- const: wrapper
- const: usb
- const: dp0
- const: dp1
- const: dp2
- const: dp3

apple,tunable-axi2af:
$ref: /schemas/types.yaml#/definitions/uint32-matrix
Expand Down Expand Up @@ -174,8 +180,9 @@ allOf:
const: 1
reg:
minItems: 11
maxItems: 11
maxItems: 12
reg-names:
minItems: 11
items:
- const: core
- const: usb2phy
Expand All @@ -188,6 +195,8 @@ allOf:
- const: usb-control
- const: firmware-data
- const: pipehandler
- description: Source select words for the four USB4 DP pixel clocks
const: dp-clock-source
required:
- '#reset-cells'
- apple,port-index
Expand Down
257 changes: 0 additions & 257 deletions Documentation/devicetree/bindings/phy/apple,t6050-dp-phy.yaml

This file was deleted.

6 changes: 5 additions & 1 deletion drivers/phy/apple/atc-t6050-combo.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ static int combo_stop(struct t6050_dp *dp)
lockdep_assert_held(&dp->lock);
if (dp->faulted)
return -EIO;
/* No tunnel clock outlives USB4 mode. */
atc_dp_tunnels_stop(dp);
if (dp->controller_active || dp->pipe_active)
return -EBUSY;
ret = combo_quiesce(dp);
Expand Down Expand Up @@ -180,8 +182,10 @@ static int combo_start(struct t6050_dp *dp, enum combo_mode mode)
ret = dp->reverse ?
APPLE_T6050_USB_RUN(&dp->usb_platform, apple_t6050_cio_init_reverse) :
APPLE_T6050_USB_RUN(&dp->usb_platform, apple_t6050_cio_init_normal);
if (!ret)
if (!ret) {
dp->cio_prepared = true;
atc_dp_tunnels_park(dp);
}
dev_info(dp->dev, "CIO mode %s (%d), %s orientation, %lld ms\n",
ret ? "failed" : "up: UC_TNBL_DONE", ret,
dp->reverse ? "reverse" : "normal",
Expand Down
Loading