From eea195e1ea5ee18678c94725f32fa3fff09a9683 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Tue, 22 Nov 2011 20:50:50 -0600 Subject: [PATCH] --- yaml --- r: 284983 b: refs/heads/master c: 284cb318c8f84744f073d4f4d3820946afaf5442 h: refs/heads/master i: 284981: 5d70e5260c182577f14be9f455ff1a7e14f50036 284979: 76200eab6e5cbf652b4b91a1dbc6fcb4ac72f2ba 284975: 95deea6c801bb84ebae815bcf89fc42ba1001d13 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/hdmi.c | 6 ++++-- trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 7 +++++-- trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h | 3 +-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index be339ad99c48..fa30351a00f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b17ce117322a446f13716132e47b672d7bf25a30 +refs/heads/master: 284cb318c8f84744f073d4f4d3820946afaf5442 diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c index 3c96d771e2c9..b727992efd6d 100644 --- a/trunk/drivers/video/omap2/dss/hdmi.c +++ b/trunk/drivers/video/omap2/dss/hdmi.c @@ -561,11 +561,13 @@ void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev) #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \ defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE) -static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data, - struct snd_pcm_substream *substream, +static int hdmi_audio_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_codec *codec = rtd->codec; + struct hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec); struct hdmi_audio_format audio_format; struct hdmi_audio_dma audio_dma; struct hdmi_core_audio_config core_cfg; diff --git a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c index e1a6ce518af6..3f74f55269bd 100644 --- a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c @@ -1204,11 +1204,14 @@ int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data, return 0; } -int hdmi_audio_trigger(struct hdmi_ip_data *ip_data, - struct snd_pcm_substream *substream, int cmd, +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 hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec); int err = 0; + switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: diff --git a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h index 204095632d27..eb5e8f7120f8 100644 --- a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h +++ b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h @@ -576,8 +576,7 @@ struct hdmi_core_audio_config { #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \ defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE) -int hdmi_audio_trigger(struct hdmi_ip_data *ip_data, - struct snd_pcm_substream *substream, int cmd, +int hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai); int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data, u32 sample_freq, u32 *n, u32 *cts);