[PATCH v2] drm/rockchip: dw_hdmi_qp: Fix io init for dw_hdmi_qp_rockchip_resume

[Andy Yan]

From: Andy Yan <andy....@rock-chips.com>

Use cfg->ctrl_ops->io_init callback make it work for all platform.
And it's also gets rid of code duplication

Fixes: 3f60dbd40d3f ("drm/rockchip: dw_hdmi_qp: Add platform ctrl callback")
Signed-off-by: Andy Yan <andy....@rock-chips.com>
Reviewed-by: Sebastian Reichel <sebastian.reic...@collabora.com>

---

Changes in v2:
- Store the ctrl_ops in struct rockchip_hdmi_qp

 .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c    | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c 
b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
index 3d1dddb34603..7d531b6f4c09 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
@@ -94,6 +94,7 @@ struct rockchip_hdmi_qp {
        struct gpio_desc *enable_gpio;
        struct delayed_work hpd_work;
        int port_id;
+       const struct rockchip_hdmi_qp_ctrl_ops *ctrl_ops;
 };
 
 struct rockchip_hdmi_qp_ctrl_ops {
@@ -461,6 +462,7 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, 
struct device *master,
                return -ENODEV;
        }
 
+       hdmi->ctrl_ops = cfg->ctrl_ops;
        hdmi->dev = &pdev->dev;
        hdmi->port_id = -ENODEV;
 
@@ -600,27 +602,8 @@ static void dw_hdmi_qp_rockchip_remove(struct 
platform_device *pdev)
 static int __maybe_unused dw_hdmi_qp_rockchip_resume(struct device *dev)
 {
        struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev);
-       u32 val;
 
-       val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) |
-             HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) |
-             HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) |
-             HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK);
-       regmap_write(hdmi->vo_regmap,
-                    hdmi->port_id ? RK3588_GRF_VO1_CON6 : RK3588_GRF_VO1_CON3,
-                    val);
-
-       val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK,
-                           RK3588_SET_HPD_PATH_MASK);
-       regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val);
-
-       if (hdmi->port_id)
-               val = HIWORD_UPDATE(RK3588_HDMI1_GRANT_SEL,
-                                   RK3588_HDMI1_GRANT_SEL);
-       else
-               val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL,
-                                   RK3588_HDMI0_GRANT_SEL);
-       regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val);
+       hdmi->ctrl_ops->io_init(hdmi);
 
        dw_hdmi_qp_resume(dev, hdmi->hdmi);
 
-- 
2.43.0