Commit d79bd6b4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

drm/omap: venc: Remove wss_data field from venc_device structure

The venc_device structure wss_data field is set to 0 and never otherwise
modified, remove it.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 374805b0
...@@ -323,7 +323,6 @@ struct venc_device { ...@@ -323,7 +323,6 @@ struct venc_device {
struct platform_device *pdev; struct platform_device *pdev;
void __iomem *base; void __iomem *base;
struct mutex venc_lock; struct mutex venc_lock;
u32 wss_data;
struct regulator *vdda_dac_reg; struct regulator *vdda_dac_reg;
struct dss_device *dss; struct dss_device *dss;
...@@ -367,8 +366,7 @@ static void venc_write_config(struct venc_device *venc, ...@@ -367,8 +366,7 @@ static void venc_write_config(struct venc_device *venc,
venc_write_reg(venc, VENC_BLACK_LEVEL, config->black_level); venc_write_reg(venc, VENC_BLACK_LEVEL, config->black_level);
venc_write_reg(venc, VENC_BLANK_LEVEL, config->blank_level); venc_write_reg(venc, VENC_BLANK_LEVEL, config->blank_level);
venc_write_reg(venc, VENC_M_CONTROL, config->m_control); venc_write_reg(venc, VENC_M_CONTROL, config->m_control);
venc_write_reg(venc, VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data | venc_write_reg(venc, VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data);
venc->wss_data);
venc_write_reg(venc, VENC_S_CARR, config->s_carr); venc_write_reg(venc, VENC_S_CARR, config->s_carr);
venc_write_reg(venc, VENC_L21__WC_CTL, config->l21__wc_ctl); venc_write_reg(venc, VENC_L21__WC_CTL, config->l21__wc_ctl);
venc_write_reg(venc, VENC_SAVID__EAVID, config->savid__eavid); venc_write_reg(venc, VENC_SAVID__EAVID, config->savid__eavid);
...@@ -543,8 +541,6 @@ static int venc_display_enable(struct omap_dss_device *dssdev) ...@@ -543,8 +541,6 @@ static int venc_display_enable(struct omap_dss_device *dssdev)
if (r) if (r)
goto err0; goto err0;
venc->wss_data = 0;
mutex_unlock(&venc->venc_lock); mutex_unlock(&venc->venc_lock);
return 0; return 0;
...@@ -585,10 +581,6 @@ static void venc_set_timings(struct omap_dss_device *dssdev, ...@@ -585,10 +581,6 @@ static void venc_set_timings(struct omap_dss_device *dssdev,
mutex_lock(&venc->venc_lock); mutex_lock(&venc->venc_lock);
/* Reset WSS data when the TV standard changes. */
if (memcmp(&venc->vm, vm, sizeof(*vm)))
venc->wss_data = 0;
venc->vm = *vm; venc->vm = *vm;
dispc_set_tv_pclk(venc->dss->dispc, 13500000); dispc_set_tv_pclk(venc->dss->dispc, 13500000);
...@@ -878,7 +870,6 @@ static int venc_probe(struct platform_device *pdev) ...@@ -878,7 +870,6 @@ static int venc_probe(struct platform_device *pdev)
mutex_init(&venc->venc_lock); mutex_init(&venc->venc_lock);
venc->wss_data = 0;
venc->vm = omap_dss_pal_vm; venc->vm = omap_dss_pal_vm;
venc_mem = platform_get_resource(venc->pdev, IORESOURCE_MEM, 0); venc_mem = platform_get_resource(venc->pdev, IORESOURCE_MEM, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment