[Freedreno] [PATCH RESEND 2/6] phy: qcom: qmp-combo: switch to DRM_AUX_BRIDGE

[Dmitry Baryshkov]

Switch to using the new DRM_AUX_BRIDGE helper to create the
transparent DRM bridge device instead of handcoding corresponding
functionality.

Acked-by: Vinod Koul <vk...@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/phy/qualcomm/Kconfig              |  2 +-
 drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 44 ++---------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig
index d891058b7c39..846f8c99547f 100644
--- a/drivers/phy/qualcomm/Kconfig
+++ b/drivers/phy/qualcomm/Kconfig
@@ -63,7 +63,7 @@ config PHY_QCOM_QMP_COMBO
        depends on DRM || DRM=n
        select GENERIC_PHY
        select MFD_SYSCON
-       select DRM_PANEL_BRIDGE if DRM
+       select DRM_AUX_BRIDGE if DRM_BRIDGE
        help
          Enable this to support the QMP Combo PHY transceiver that is used
          with USB3 and DisplayPort controllers on Qualcomm chips.
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c 
b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index 0417856b8e7b..435cd849e82e 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -21,7 +21,7 @@
 #include <linux/usb/typec.h>
 #include <linux/usb/typec_mux.h>
 
-#include <drm/drm_bridge.h>
+#include <drm/bridge/aux-bridge.h>
 
 #include <dt-bindings/phy/phy-qcom-qmp.h>
 
@@ -1419,8 +1419,6 @@ struct qmp_combo {
        struct clk_hw dp_link_hw;
        struct clk_hw dp_pixel_hw;
 
-       struct drm_bridge bridge;
-
        struct typec_switch_dev *sw;
        enum typec_orientation orientation;
 };
@@ -3191,44 +3189,6 @@ static int qmp_combo_typec_switch_register(struct 
qmp_combo *qmp)
 }
 #endif
 
-#if IS_ENABLED(CONFIG_DRM)
-static int qmp_combo_bridge_attach(struct drm_bridge *bridge,
-                                  enum drm_bridge_attach_flags flags)
-{
-       struct qmp_combo *qmp = container_of(bridge, struct qmp_combo, bridge);
-       struct drm_bridge *next_bridge;
-
-       if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
-               return -EINVAL;
-
-       next_bridge = devm_drm_of_get_bridge(qmp->dev, qmp->dev->of_node, 0, 0);
-       if (IS_ERR(next_bridge)) {
-               dev_err(qmp->dev, "failed to acquire drm_bridge: %pe\n", 
next_bridge);
-               return PTR_ERR(next_bridge);
-       }
-
-       return drm_bridge_attach(bridge->encoder, next_bridge, bridge,
-                                DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-}
-
-static const struct drm_bridge_funcs qmp_combo_bridge_funcs = {
-       .attach = qmp_combo_bridge_attach,
-};
-
-static int qmp_combo_dp_register_bridge(struct qmp_combo *qmp)
-{
-       qmp->bridge.funcs = &qmp_combo_bridge_funcs;
-       qmp->bridge.of_node = qmp->dev->of_node;
-
-       return devm_drm_bridge_add(qmp->dev, &qmp->bridge);
-}
-#else
-static int qmp_combo_dp_register_bridge(struct qmp_combo *qmp)
-{
-       return 0;
-}
-#endif
-
 static int qmp_combo_parse_dt_lecacy_dp(struct qmp_combo *qmp, struct 
device_node *np)
 {
        struct device *dev = qmp->dev;
@@ -3440,7 +3400,7 @@ static int qmp_combo_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = qmp_combo_dp_register_bridge(qmp);
+       ret = drm_aux_bridge_register(dev);
        if (ret)
                return ret;
 
-- 
2.39.2