Merge remote-tracking branch 'fbdev/for-next'

[karo-tx-linux.git] / drivers / video / omap2 / dss / dss_features.c

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index b9cfebb378a27a9fe66c20f00c42ffd425fe5438..f8fd6dbacabcb2092521a1bf81c9d5fc361fb7e7 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -789,50 +789,6 @@ static const struct omap_dss_features omap5_dss_features = {
        .burst_size_unit = 16,
 };
 
-#if defined(CONFIG_OMAP4_DSS_HDMI)
-/* HDMI OMAP4 Functions*/
-static const struct ti_hdmi_ip_ops omap4_hdmi_functions = {
-
-       .video_configure        =       ti_hdmi_4xxx_basic_configure,
-       .phy_enable             =       ti_hdmi_4xxx_phy_enable,
-       .phy_disable            =       ti_hdmi_4xxx_phy_disable,
-       .read_edid              =       ti_hdmi_4xxx_read_edid,
-       .pll_enable             =       ti_hdmi_4xxx_pll_enable,
-       .pll_disable            =       ti_hdmi_4xxx_pll_disable,
-       .video_enable           =       ti_hdmi_4xxx_wp_video_start,
-       .video_disable          =       ti_hdmi_4xxx_wp_video_stop,
-       .dump_wrapper           =       ti_hdmi_4xxx_wp_dump,
-       .dump_core              =       ti_hdmi_4xxx_core_dump,
-       .dump_pll               =       ti_hdmi_4xxx_pll_dump,
-       .dump_phy               =       ti_hdmi_4xxx_phy_dump,
-#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
-       .audio_enable           =       ti_hdmi_4xxx_wp_audio_enable,
-       .audio_disable          =       ti_hdmi_4xxx_wp_audio_disable,
-       .audio_start            =       ti_hdmi_4xxx_audio_start,
-       .audio_stop             =       ti_hdmi_4xxx_audio_stop,
-       .audio_config           =       ti_hdmi_4xxx_audio_config,
-       .audio_get_dma_port     =       ti_hdmi_4xxx_audio_get_dma_port,
-#endif
-
-};
-
-void dss_init_hdmi_ip_ops(struct hdmi_ip_data *ip_data,
-               enum omapdss_version version)
-{
-       switch (version) {
-       case OMAPDSS_VER_OMAP4430_ES1:
-       case OMAPDSS_VER_OMAP4430_ES2:
-       case OMAPDSS_VER_OMAP4:
-               ip_data->ops = &omap4_hdmi_functions;
-               break;
-       default:
-               ip_data->ops = NULL;
-       }
-
-       WARN_ON(ip_data->ops == NULL);
-}
-#endif
-
 /* Functions returning values related to a DSS feature */
 int dss_feat_get_num_mgrs(void)
 {