OMAPDSS: HDMI: Create function to enable HDMI audio

In order to separate clearly IP-specific code from general DSS code,
a function for OMAP4 audio enable is created. This function is
included in the HDMI IP ops to align with the current implementation
of the DSS HDMI driver. This function is to be used by the ASoC
HDMI audio codec.

Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

3 files changed, 31 insertions, 13 deletions

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index 5e4b829605da..afcb59301c37 100644
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -472,6 +472,10 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = {
         .dump_core              =       ti_hdmi_4xxx_core_dump,
         .dump_pll               =       ti_hdmi_4xxx_pll_dump,
         .dump_phy               =       ti_hdmi_4xxx_phy_dump,
+#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+        .audio_enable           =       ti_hdmi_4xxx_wp_audio_enable,
+#endif
 
 };
 
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index 2c3443dabb14..7503f7f619a7 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -110,6 +110,11 @@ struct ti_hdmi_ip_ops {
 
         void (*dump_phy)(struct hdmi_ip_data *ip_data, struct seq_file *s);
 
+#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+        void (*audio_enable)(struct hdmi_ip_data *ip_data, bool start);
+#endif
+
 };
 
 struct hdmi_ip_data {
@@ -134,5 +139,8 @@ void ti_hdmi_4xxx_wp_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_pll_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
-
+#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable);
+#endif
 #endif
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index 3f74f55269bd..220e0ce5e5ef 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -1204,35 +1204,41 @@ int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
         return 0;
 }
 
+void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable)
+{
+        REG_FLD_MOD(hdmi_av_base(ip_data),
+                                HDMI_CORE_AV_AUD_MODE, enable, 0, 0);
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                                HDMI_WP_AUDIO_CTRL, enable, 31, 31);
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                                HDMI_WP_AUDIO_CTRL, enable, 30, 30);
+}
+
 int hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
                                 struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
+        struct platform_device *pdev = to_platform_device(codec->dev);
         struct hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec);
         int err = 0;
 
+        if (!(ip_data->ops) && !(ip_data->ops->audio_enable)) {
+                dev_err(&pdev->dev, "Cannot enable/disable audio\n");
+                return -ENODEV;
+        }
+
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                REG_FLD_MOD(hdmi_av_base(ip_data),
-                                        HDMI_CORE_AV_AUD_MODE, 1, 0, 0);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 1, 31, 31);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 1, 30, 30);
+                ip_data->ops->audio_enable(ip_data, true);
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                REG_FLD_MOD(hdmi_av_base(ip_data),
-                                        HDMI_CORE_AV_AUD_MODE, 0, 0, 0);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 0, 30, 30);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 0, 31, 31);
+                ip_data->ops->audio_enable(ip_data, false);
                 break;
         default:
                 err = -EINVAL;