drm/omap: venc: remove set_type & invert_vid_out_polarity

Non-DT booting is no longer supported, so remove legacy code.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index f7a5731..b1f6aa0 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -157,14 +157,6 @@ static int opa362_check_timings(struct omap_dss_device *dssdev,
        return in->ops.atv->check_timings(in, vm);
 }
 
-static void opa362_set_type(struct omap_dss_device *dssdev,
-               enum omap_dss_venc_type type)
-{
-       /* we can only drive a COMPOSITE output */
-       WARN_ON(type != OMAP_DSS_VENC_TYPE_COMPOSITE);
-
-}
-
 static const struct omapdss_atv_ops opa362_atv_ops = {
        .connect        = opa362_connect,
        .disconnect     = opa362_disconnect,
@@ -175,8 +167,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = {
        .check_timings  = opa362_check_timings,
        .set_timings    = opa362_set_timings,
        .get_timings    = opa362_get_timings,
-
-       .set_type       = opa362_set_type,
 };
 
 static int opa362_probe(struct platform_device *pdev)

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 1ce53b0..abdb332 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -525,11 +525,6 @@ struct omapdss_atv_ops {
        void (*get_timings)(struct omap_dss_device *dssdev,
                            struct videomode *vm);
 
-       void (*set_type)(struct omap_dss_device *dssdev,
-               enum omap_dss_venc_type type);
-       void (*invert_vid_out_polarity)(struct omap_dss_device *dssdev,
-               bool invert_polarity);
-
        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
        u32 (*get_wss)(struct omap_dss_device *dssdev);
 };
@@ -642,11 +637,6 @@ struct omap_dss_device {
                struct {
                        int module;
                } dsi;
-
-               struct {
-                       enum omap_dss_venc_type type;
-                       bool invert_polarity;
-               } venc;
        } phy;
 
        struct {

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 8e836fd..a6bfb39 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -616,26 +616,6 @@ err:
        return r;
 }
 
-static void venc_set_type(struct omap_dss_device *dssdev,
-               enum omap_dss_venc_type type)
-{
-       mutex_lock(&venc.venc_lock);
-
-       venc.type = type;
-
-       mutex_unlock(&venc.venc_lock);
-}
-
-static void venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,
-               bool invert_polarity)
-{
-       mutex_lock(&venc.venc_lock);
-
-       venc.invert_polarity = invert_polarity;
-
-       mutex_unlock(&venc.venc_lock);
-}
-
 static int venc_init_regulator(void)
 {
        struct regulator *vdda_dac;
@@ -779,9 +759,6 @@ static const struct omapdss_atv_ops venc_ops = {
        .set_timings = venc_set_timings,
        .get_timings = venc_get_timings,
 
-       .set_type = venc_set_type,
-       .invert_vid_out_polarity = venc_invert_vid_out_polarity,
-
        .set_wss = venc_set_wss,
        .get_wss = venc_get_wss,
 };