diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2014-01-25 12:14:39 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-13 14:41:31 -0500 |
commit | f0b33b282c17337276504d6a700d0f558f1a6891 (patch) | |
tree | 76239680164e37d619e8abe3e04d32bf7df48eb9 | |
parent | bdf6345b3262d0ddbc6405fbc0fedd2941bec08e (diff) |
drm/i2c: tda998x: use ALSA IEC958 definitions and update audio frequency
This patch sets the frequency as 'not indicated' instead of '48kHz'
and uses the asound values in the channel status definition.
Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/gpu/drm/i2c/tda998x_drv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 5be145ccbb08..e5b764b95866 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <linux/hdmi.h> | 20 | #include <linux/hdmi.h> |
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <sound/asoundef.h> | ||
22 | 23 | ||
23 | #include <drm/drmP.h> | 24 | #include <drm/drmP.h> |
24 | #include <drm/drm_crtc_helper.h> | 25 | #include <drm/drm_crtc_helper.h> |
@@ -649,10 +650,11 @@ tda998x_configure_audio(struct drm_encoder *encoder, | |||
649 | reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_CTS); | 650 | reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_CTS); |
650 | 651 | ||
651 | /* Write the channel status */ | 652 | /* Write the channel status */ |
652 | buf[0] = 0x04; | 653 | buf[0] = IEC958_AES0_CON_NOT_COPYRIGHT; |
653 | buf[1] = 0x00; | 654 | buf[1] = 0x00; |
654 | buf[2] = 0x00; | 655 | buf[2] = IEC958_AES3_CON_FS_NOTID; |
655 | buf[3] = 0xf1; | 656 | buf[3] = IEC958_AES4_CON_ORIGFS_NOTID | |
657 | IEC958_AES4_CON_MAX_WORDLEN_24; | ||
656 | reg_write_range(encoder, REG_CH_STAT_B(0), buf, 4); | 658 | reg_write_range(encoder, REG_CH_STAT_B(0), buf, 4); |
657 | 659 | ||
658 | tda998x_audio_mute(encoder, true); | 660 | tda998x_audio_mute(encoder, true); |