Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

[cascardo/linux.git] / drivers / gpu / drm / imx / dw_hdmi-imx.c

diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 1834ac8..a3ecf10 100644 (file)
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -75,10 +75,10 @@ static const struct dw_hdmi_curr_ctrl imx_cur_ctr[] = {
        },
 };
 
-static const struct dw_hdmi_sym_term imx_sym_term[] = {
-       /*pixelclk   symbol   term*/
-       { 148500000, 0x800d, 0x0005 },
-       { ~0UL,      0x0000, 0x0000 }
+static const struct dw_hdmi_phy_config imx_phy_config[] = {
+       /*pixelclk   symbol   term   vlev */
+       { 148500000, 0x800d, 0x0005, 0x01ad},
+       { ~0UL,      0x0000, 0x0000, 0x0000}
 };
 
 static int dw_hdmi_imx_parse_dt(struct imx_hdmi *hdmi)
@@ -163,7 +163,7 @@ static enum drm_mode_status imx6dl_hdmi_mode_valid(struct drm_connector *con,
 static struct dw_hdmi_plat_data imx6q_hdmi_drv_data = {
        .mpll_cfg   = imx_mpll_cfg,
        .cur_ctr    = imx_cur_ctr,
-       .sym_term   = imx_sym_term,
+       .phy_config = imx_phy_config,
        .dev_type   = IMX6Q_HDMI,
        .mode_valid = imx6q_hdmi_mode_valid,
 };
@@ -171,7 +171,7 @@ static struct dw_hdmi_plat_data imx6q_hdmi_drv_data = {
 static struct dw_hdmi_plat_data imx6dl_hdmi_drv_data = {
        .mpll_cfg = imx_mpll_cfg,
        .cur_ctr  = imx_cur_ctr,
-       .sym_term = imx_sym_term,
+       .phy_config = imx_phy_config,
        .dev_type = IMX6DL_HDMI,
        .mode_valid = imx6dl_hdmi_mode_valid,
 };