OMAPDSS: HDMI: Decouple wrapper enable/disable and audio start/stop

Decouple the enable/disable operation of the HDMI audio wrapper from
audio start/stop. Otherwise, an audio FIFO underflow may occur. The
audio wrapper enablement must be done after configuration and
before audio playback is started.

Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>

1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index a1cbd2fe9889..7b524de831a1 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -1254,22 +1254,31 @@ int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
 
 int ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data)
 {
-        REG_FLD_MOD(hdmi_av_base(ip_data),
-                    HDMI_CORE_AV_AUD_MODE, true, 0, 0);
         REG_FLD_MOD(hdmi_wp_base(ip_data),
                     HDMI_WP_AUDIO_CTRL, true, 31, 31);
+        return 0;
+}
+
+void ti_hdmi_4xxx_wp_audio_disable(struct hdmi_ip_data *ip_data)
+{
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                    HDMI_WP_AUDIO_CTRL, false, 31, 31);
+}
+
+int ti_hdmi_4xxx_audio_start(struct hdmi_ip_data *ip_data)
+{
+        REG_FLD_MOD(hdmi_av_base(ip_data),
+                    HDMI_CORE_AV_AUD_MODE, true, 0, 0);
         REG_FLD_MOD(hdmi_wp_base(ip_data),
                     HDMI_WP_AUDIO_CTRL, true, 30, 30);
         return 0;
 }
 
-void ti_hdmi_4xxx_wp_audio_disable(struct hdmi_ip_data *ip_data)
+void ti_hdmi_4xxx_audio_stop(struct hdmi_ip_data *ip_data)
 {
         REG_FLD_MOD(hdmi_av_base(ip_data),
                     HDMI_CORE_AV_AUD_MODE, false, 0, 0);
         REG_FLD_MOD(hdmi_wp_base(ip_data),
-                    HDMI_WP_AUDIO_CTRL, false, 31, 31);
-        REG_FLD_MOD(hdmi_wp_base(ip_data),
                     HDMI_WP_AUDIO_CTRL, false, 30, 30);
 }
 #endif