Commit 1d34597a authored by Andy Yan's avatar Andy Yan Committed by Heiko Stuebner
Browse files

drm/rockchip: dw_hdmi_qp: Fix io init for dw_hdmi_qp_rockchip_resume 



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

Fixes: 3f60dbd4 ("drm/rockchip: dw_hdmi_qp: Add platform ctrl callback")
Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250317102757.565679-1-andyshrk@163.com
parent 210db264

drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c

+3 −20
Original line number Diff line number Diff line
@@ -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);