iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'phy-fixes3-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

Browse Source 
Pull phy fixes from Vinod Koul:

 - fixes for Qualcomm qmp-combo driver for ordering of drm and type-c
   switch registartion due to drivers might not probe defer after having
   registered child devices to avoid triggering a probe deferral loop.

   This fixes internal display on Lenovo ThinkPad X13s

* tag 'phy-fixes3-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: qcom-qmp-combo: fix type-c switch registration
  phy: qcom-qmp-combo: fix drm bridge registration
This commit is contained in:
Linus Torvalds
2024-03-10 11:39:48 -07:00
parent 137e0ec05a 47b412c1ea
commit 210ee636c4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/phy/qualcomm/phy-qcom-qmp-combo.c
View File

@ -3562,14 +3562,6 @@ static int qmp_combo_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
ret = qmp_combo_typec_switch_register(qmp);
if (ret)
return ret;
ret = drm_aux_bridge_register(dev);
if (ret)
return ret;
/* Check for legacy binding with child nodes. */ /* Check for legacy binding with child nodes. */
usb_np = of_get_child_by_name(dev->of_node, "usb3-phy"); usb_np = of_get_child_by_name(dev->of_node, "usb3-phy");
if (usb_np) { if (usb_np) {
@ -3589,6 +3581,14 @@ static int qmp_combo_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_node_put; goto err_node_put;
ret = qmp_combo_typec_switch_register(qmp);
if (ret)
goto err_node_put;
ret = drm_aux_bridge_register(dev);
if (ret)
goto err_node_put;
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
ret = devm_pm_runtime_enable(dev); ret = devm_pm_runtime_enable(dev);
if (ret) if (ret)