diff options
| author | Goran Jonsson <goran.xg.jonsson@stericsson.com> | 2012-01-20 14:24:50 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:06 +0200 |
| commit | 3fde364b673c58d925c4cbdefb2aea82b3a6d269 (patch) | |
| tree | 1449ea876d146374383a57540252dec2e6f584ee /sound | |
| parent | 543296a34d8586fea0535faff7a2f575cdd8f624 (diff) | |
ASoC: Ux500: Correct AV8100 InfoFrame-settings
Change settings in the HDMI Audio InfoFrame sent to AV8100
to be compliant with the HDMI 1.4 standard.
ST-Ericsson ID: 399365
ST-Ericsson Linux next: Not tested
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I355a0558d37c73f67e6391563b05791d7b0410f1
Signed-off-by: Goran Jonsson <goran.xg.jonsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/46082
Reviewed-by: QABUILD
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/av8100_audio.c | 7 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_av8100.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/av8100_audio.c b/sound/soc/codecs/av8100_audio.c index bca5b7a4329..1f706a5f0f6 100644 --- a/sound/soc/codecs/av8100_audio.c +++ b/sound/soc/codecs/av8100_audio.c @@ -242,12 +242,13 @@ static int av8100_codec_send_audio_infoframe(struct hdmi_audio_settings *as) info_fr.data[7] = 0; info_fr.data[8] = 0; info_fr.data[9] = 0; - info_fr.crc = info_fr.version + + info_fr.crc = 0x100 - (info_fr.type + + info_fr.version + info_fr.length + info_fr.data[0] + info_fr.data[1] + info_fr.data[3] + - info_fr.data[4]; + info_fr.data[4]); config.infoframes_format.type = info_fr.type; config.infoframes_format.version = info_fr.version; config.infoframes_format.crc = info_fr.crc; @@ -406,7 +407,7 @@ static int av8100_codec_probe(struct snd_soc_codec *codec) { pr_debug("%s: Enter (codec->name = %s).\n", __func__, codec->name); - audio_coding_type = AV8100_CODEC_CT_IEC60958_PCM; + audio_coding_type = AV8100_CODEC_CT_REFER; /* Add controls with events */ snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&hdmi_coding_type_control, codec)); diff --git a/sound/soc/ux500/ux500_av8100.c b/sound/soc/ux500/ux500_av8100.c index 3e8f29b14b3..4ccc7531f4b 100644 --- a/sound/soc/ux500/ux500_av8100.c +++ b/sound/soc/ux500/ux500_av8100.c @@ -97,8 +97,8 @@ static int ux500_av8100_hw_params(struct snd_pcm_substream *substream, /* Change HDMI audio-settings for codec-DAI. */ pr_debug("%s: Change HDMI audio-settings for codec-DAI.\n", __func__); as.audio_channel_count = hdmi_cc; - as.sampling_frequency = AV8100_CODEC_SF_48KHZ; - as.sample_size = AV8100_CODEC_SS_16BIT; + as.sampling_frequency = AV8100_CODEC_SF_REFER; + as.sample_size = AV8100_CODEC_SS_REFER; as.channel_allocation = hdmi_ca; as.level_shift_value = AV8100_CODEC_LSV_0DB; as.downmix_inhibit = false; |