The QMP USB3/DP Combo PHY hosts an USB3 phy and a DP PHY on top
of a combo glue to route either lanes to the 4 shared physical lanes.
The routing of the lanes can be:
- 2 DP + 2 USB3
- 4 DP
- 2 USB3
Get the static lanes mapping from DT and stop registering the
USB-C muxes in favor of a static mode and orientation detemined
by the mapping.
This allows supporting boards with direct connection of USB3 and
DisplayPort lanes to the QMP Combo PHY lanes, not using the
USB-C Altmode feature.
Signed-off-by: Neil Armstrong <neil.armstr...@linaro.org>
---
drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 118 +++++++++++++++++++++++++++---
1 file changed, 109 insertions(+), 9 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index
7b5af30f1d028c592500e723ecd27b54ed554709..9a121a61e77ed8a839fa0fb588ec379382fb63b2
100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -24,6 +24,7 @@
#include <drm/bridge/aux-bridge.h>
+#include <dt-bindings/phy/phy.h>
#include <dt-bindings/phy/phy-qcom-qmp.h>
#include "phy-qcom-qmp-common.h"
@@ -1744,6 +1745,85 @@ static const u8 qmp_dp_v6_pre_emphasis_hbr_rbr[4][4] = {
{ 0x22, 0xff, 0xff, 0xff }
};
+static struct qmp_lanes_mapping {
+ u32 map[4];
+ enum qmpphy_mode mode;
+ enum typec_orientation orientation;
+} const qmpphy_lanes_mapping[] = {
+ /* No lanes connected, set 'safe' USB3 mode */
+ {
+ .map = {PHY_NONE, PHY_NONE, PHY_NONE, PHY_NONE},
+ .mode = QMPPHY_MODE_USB3_ONLY,
+ .orientation = TYPEC_ORIENTATION_NONE,
+ },
+ /* USB3 Only */
+ {
+ .map = {PHY_TYPE_USB3, PHY_TYPE_USB3, PHY_NONE, PHY_NONE},
+ .mode = QMPPHY_MODE_USB3_ONLY,
+ .orientation = TYPEC_ORIENTATION_NORMAL,
+ },
+ /* USB3 Only, reverted */
+ {
+ .map = {PHY_NONE, PHY_NONE, PHY_TYPE_USB3, PHY_TYPE_USB3},
+ .mode = QMPPHY_MODE_USB3_ONLY,
+ .orientation = TYPEC_ORIENTATION_REVERSE,
+ },
+ /* USB3 and DP single lane */
+ {
+ .map = {PHY_TYPE_USB3, PHY_TYPE_USB3, PHY_NONE, PHY_TYPE_DP},
+ .mode = QMPPHY_MODE_USB3DP,
+ .orientation = TYPEC_ORIENTATION_NORMAL,
+ },
+ /* USB3 and DP */
+ {
+ .map = {PHY_TYPE_USB3, PHY_TYPE_USB3, PHY_TYPE_DP, PHY_TYPE_DP},
+ .mode = QMPPHY_MODE_USB3DP,
+ .orientation = TYPEC_ORIENTATION_NORMAL,
+ },
+ /* DP single lane and USB3 */
+ {
+ .map = {PHY_TYPE_DP, PHY_NONE, PHY_TYPE_USB3, PHY_TYPE_USB3},
+ .mode = QMPPHY_MODE_USB3DP,
+ .orientation = TYPEC_ORIENTATION_REVERSE,
+ },
+ /* DP and USB3 */
+ {
+ .map = {PHY_TYPE_DP, PHY_TYPE_DP, PHY_TYPE_USB3, PHY_TYPE_USB3},
+ .mode = QMPPHY_MODE_USB3DP,
+ .orientation = TYPEC_ORIENTATION_REVERSE,
+ },
+ /* DP single lane */
+ {
+ .map = {PHY_TYPE_DP, PHY_NONE, PHY_NONE, PHY_NONE},
+ .mode = QMPPHY_MODE_DP_ONLY,
+ .orientation = TYPEC_ORIENTATION_REVERSE,
+ },
+ /* DP 2 lanes */
+ {
+ .map = {PHY_TYPE_DP, PHY_TYPE_DP, PHY_NONE, PHY_NONE},
+ .mode = QMPPHY_MODE_DP_ONLY,
+ .orientation = TYPEC_ORIENTATION_REVERSE,
+ },
+ /* DP 4 lanes */
+ {
+ .map = {PHY_TYPE_DP, PHY_TYPE_DP, PHY_TYPE_DP, PHY_TYPE_DP},
+ .mode = QMPPHY_MODE_DP_ONLY,
+ .orientation = TYPEC_ORIENTATION_NORMAL,
+ },
+ /* DP 2 lanes, reverted */
+ {
+ .map = {PHY_NONE, PHY_NONE, PHY_TYPE_DP, PHY_TYPE_DP},
+ .mode = QMPPHY_MODE_DP_ONLY,
+ .orientation = TYPEC_ORIENTATION_NORMAL,
+ },
+ /* DP single lane, reverted */
+ {
+ .map = {PHY_NONE, PHY_NONE, PHY_NONE, PHY_TYPE_DP},
+ .mode = QMPPHY_MODE_DP_ONLY,
+ .orientation = TYPEC_ORIENTATION_NORMAL,
+ },
+};
+
struct qmp_combo;
struct qmp_combo_offsets {
@@ -4123,7 +4203,7 @@ static int qmp_combo_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *dp_np, *usb_np;
struct phy_provider *phy_provider;
- int ret;
+ int ret, i;
qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL);
if (!qmp)
@@ -4167,9 +4247,34 @@ static int qmp_combo_probe(struct platform_device *pdev)
if (ret)
goto err_node_put;
- ret = qmp_combo_typec_register(qmp);
- if (ret)
- goto err_node_put;
+ qmp->qmpphy_mode = QMPPHY_MODE_USB3DP;
+
+ if (of_find_property(dev->of_node, "qcom,static-lanes-mapping", NULL)) {
+ u32 mapping[4];
+
+ ret = of_property_read_u32_array(dev->of_node,
"qcom,static-lanes-mapping",
+ mapping, 4);
+ if (ret) {
+ dev_err(dev, "failed to read static lanes mapping:
%d\n", ret);
+ goto err_node_put;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(qmpphy_lanes_mapping); ++i) {
+ if (memcmp(mapping, &qmpphy_lanes_mapping[i].map,
sizeof(mapping)))
+ continue;
+
+ qmp->qmpphy_mode = qmpphy_lanes_mapping[i].mode;
+ qmp->orientation = qmpphy_lanes_mapping[i].orientation;
+
+ break;
+ }
+ if (i == ARRAY_SIZE(qmpphy_lanes_mapping))
+ dev_warn(dev, "invalid qcom,static-lanes-mapping,
keeping default\n");
+ } else {
+ ret = qmp_combo_typec_register(qmp);
+ if (ret)
+ goto err_node_put;
+ }
ret = drm_aux_bridge_register(dev);
if (ret)
@@ -4189,11 +4294,6 @@ static int qmp_combo_probe(struct platform_device *pdev)
if (ret)
goto err_node_put;
- /*
- * The hw default is USB3_ONLY, but USB3+DP mode lets us more easily
- * check both sub-blocks' init tables for blunders at probe time.
- */
- qmp->qmpphy_mode = QMPPHY_MODE_USB3DP;
qmp->usb_phy = devm_phy_create(dev, usb_np, &qmp_combo_usb_phy_ops);
if (IS_ERR(qmp->usb_phy)) {
--
2.34.1
