Commit 28bbb5ff authored by Sascha Hauer's avatar Sascha Hauer Committed by Heiko Stuebner
Browse files

drm/rockchip: dw_hdmi: add rk3568 support 



Add a new dw_hdmi_plat_data struct and new compatible for rk3568.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Tested-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220422072841.2206452-8-s.hauer@pengutronix.de
parent 77b0693f

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

+31 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
#define RK3399_GRF_SOC_CON20		0x6250

#define RK3399_HDMI_LCDC_SEL		BIT(6)



#define RK3568_GRF_VO_CON1		0x0364

#define RK3568_HDMI_SDAIN_MSK		BIT(15)

#define RK3568_HDMI_SCLIN_MSK		BIT(14)



#define HIWORD_UPDATE(val, mask)	(val | (mask) << 16)



/**
@@ -473,6 +477,19 @@ static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = { 
	.use_drm_infoframe = true,

};



static struct rockchip_hdmi_chip_data rk3568_chip_data = {

	.lcdsel_grf_reg = -1,

};



static const struct dw_hdmi_plat_data rk3568_hdmi_drv_data = {

	.mode_valid = dw_hdmi_rockchip_mode_valid,

	.mpll_cfg   = rockchip_mpll_cfg,

	.cur_ctr    = rockchip_cur_ctr,

	.phy_config = rockchip_phy_config,

	.phy_data = &rk3568_chip_data,

	.use_drm_infoframe = true,

};



static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = {

	{ .compatible = "rockchip,rk3228-dw-hdmi",

	  .data = &rk3228_hdmi_drv_data
@@ -486,6 +503,9 @@ static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = { 
	{ .compatible = "rockchip,rk3399-dw-hdmi",

	  .data = &rk3399_hdmi_drv_data

	},

	{ .compatible = "rockchip,rk3568-dw-hdmi",

	  .data = &rk3568_hdmi_drv_data

	},

	{},

};

MODULE_DEVICE_TABLE(of, dw_hdmi_rockchip_dt_ids);
@@ -520,6 +540,9 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
	encoder = &hdmi->encoder.encoder;



	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);

	rockchip_drm_encoder_set_crtc_endpoint_id(&hdmi->encoder,

						  dev->of_node, 0, 0);



	/*

	 * If we failed to find the CRTC(s) which this encoder is

	 * supposed to be connected to, it's because the CRTC has
@@ -550,6 +573,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
		return ret;

	}



	if (hdmi->chip_data == &rk3568_chip_data) {

		regmap_write(hdmi->regmap, RK3568_GRF_VO_CON1,

			     HIWORD_UPDATE(RK3568_HDMI_SDAIN_MSK |

					   RK3568_HDMI_SCLIN_MSK,

					   RK3568_HDMI_SDAIN_MSK |

					   RK3568_HDMI_SCLIN_MSK));

	}



	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);