[PATCH v2 10/11] platform/chrome: cros_ec_typec: Support DP orientation
From: Stephen Boyd <hidden>
Date: 2024-08-15 00:34:41
Also in:
chrome-platform, dri-devel, linux-patches, lkml
Subsystem:
chrome hardware platform support, chromeos ec usb type-c driver, the rest · Maintainers:
Benson Leung, Tzung-Bi Shih, Abhishek Pandit-Subedi, Jameson Thies, Andrei Kuchynski, Linus Torvalds
Handle orientation for the type-c port when the DT node has the 'orientation' property. The 'orientation' property is present when the DisplayPort lanes are directly wired to the usb-c-connector and the board design relies on the DP lanes to be remapped by software. The property wouldn't be present if, for example, the EC controls a port mapper part that flips the DP lanes for the port orientation. Pass the port orientation to drm_dp_typec_bridge_assign_pins() when the DT property is present so that the previous drm_bridge in the bridge chain can remap the DP lanes to the right usb-c-connector SuperSpeed pins for the orientation. Cc: Prashant Malani <redacted> Cc: Benson Leung <bleung@chromium.org> Cc: Tzung-Bi Shih <tzungbi@kernel.org> Cc: <redacted> Cc: Pin-yen Lin <redacted> Signed-off-by: Stephen Boyd <redacted> --- drivers/platform/chrome/cros_ec_typec.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index fa7f7efb9d3f..9b54b3288f5f 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c@@ -28,6 +28,7 @@ struct cros_typec_dp_bridge { struct cros_typec_data *typec_data; struct drm_dp_typec_bridge_dev *dev; struct cros_typec_port *active_port; + bool orientation; }; #define DP_PORT_VDO (DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | BIT(DP_PIN_ASSIGN_D)) | \
@@ -449,13 +450,15 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec) struct device *dev = typec->dev; struct cros_typec_dp_bridge *dp_bridge; struct fwnode_handle *ep __free(fwnode_handle); + struct fwnode_handle *devnode; struct drm_dp_typec_bridge_dev *dp_dev; int num_lanes; struct drm_dp_typec_bridge_desc desc = { .of_node = dev->of_node, }; - ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), 0, 0, 0); + devnode = dev_fwnode(dev); + ep = fwnode_graph_get_endpoint_by_id(devnode, 0, 0, 0); if (!ep) { /* There isn't a DP input endpoint. Ignore. */ return 0;
@@ -467,6 +470,8 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec) typec->dp_bridge = dp_bridge; dp_bridge->typec_data = typec; + dp_bridge->orientation = fwnode_property_read_bool(devnode, "orientation"); + num_lanes = fwnode_property_count_u32(ep, "data-lanes"); if (num_lanes < 0) num_lanes = 4;
@@ -582,6 +587,7 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec, u32 cable_tbt_vdo; u32 cable_dp_vdo; int ret; + enum typec_orientation orientation; bool hpd_asserted = port->mux_flags & USB_PD_MUX_HPD_LVL; if (typec->pd_ctrl_ver < 2) {
@@ -622,7 +628,13 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec, } if (dp_bridge && dp_bridge->active_port == port) { - ret = drm_dp_typec_bridge_assign_pins(dp_bridge->dev, dp_data.conf, 0, + orientation = TYPEC_ORIENTATION_NORMAL; + if (dp_bridge->orientation && + port->mux_flags & USB_PD_MUX_POLARITY_INVERTED) + orientation = TYPEC_ORIENTATION_REVERSE; + + ret = drm_dp_typec_bridge_assign_pins(dp_bridge->dev, dp_data.conf, + orientation, port->lane_mapping); if (ret) return ret;
--
https://chromeos.dev