diff options
Diffstat (limited to 'drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c')
-rw-r--r-- | drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c index 1e99149560f0..c77d865b1f99 100644 --- a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c +++ b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c | |||
@@ -898,10 +898,15 @@ static void ti_hdmi_5xxx_core_audio_config(struct hdmi_ip_data *ip_data, | |||
898 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5); | 898 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5); |
899 | /* enable two channels in GPA */ | 899 | /* enable two channels in GPA */ |
900 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 3, 7, 0); | 900 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 3, 7, 0); |
901 | } else if (cfg->layout == HDMI_AUDIO_LAYOUT_6CH) { | ||
902 | /* select HBR/SPDIF interfaces */ | ||
903 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5); | ||
904 | /* enable six channels in GPA */ | ||
905 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 0x3F, 7, 0); | ||
901 | } else { | 906 | } else { |
902 | /* select HBR/SPDIF interfaces */ | 907 | /* select HBR/SPDIF interfaces */ |
903 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5); | 908 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5); |
904 | /* enable two channels in GPA */ | 909 | /* enable eight channels in GPA */ |
905 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 0xFF, 7, 0); | 910 | REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 0xFF, 7, 0); |
906 | } | 911 | } |
907 | 912 | ||