diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-08-31 01:46:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-01 06:17:49 -0400 |
commit | 6d86577124bd674209954517a074a472456c758b (patch) | |
tree | 2f8d768d6e76adf7dd9090eed9dac3f3fc9b8716 /drivers/video | |
parent | c88e7b93a80bd46899c4cb09a9b2d52bb04d79bd (diff) |
fbdev: sh-mobile: Add HDMI sound type selection
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/sh_mobile_hdmi.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c index 2fde08cc66bf..8a05c5b0b9b8 100644 --- a/drivers/video/sh_mobile_hdmi.c +++ b/drivers/video/sh_mobile_hdmi.c | |||
@@ -318,6 +318,9 @@ static void sh_hdmi_video_config(struct sh_hdmi *hdmi) | |||
318 | */ | 318 | */ |
319 | static void sh_hdmi_audio_config(struct sh_hdmi *hdmi) | 319 | static void sh_hdmi_audio_config(struct sh_hdmi *hdmi) |
320 | { | 320 | { |
321 | u8 data; | ||
322 | struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data; | ||
323 | |||
321 | /* | 324 | /* |
322 | * [7:4] L/R data swap control | 325 | * [7:4] L/R data swap control |
323 | * [3:0] appropriate N[19:16] | 326 | * [3:0] appropriate N[19:16] |
@@ -335,7 +338,23 @@ static void sh_hdmi_audio_config(struct sh_hdmi *hdmi) | |||
335 | * [6:5] set required down sampling rate if required | 338 | * [6:5] set required down sampling rate if required |
336 | * [4:3] set required audio source | 339 | * [4:3] set required audio source |
337 | */ | 340 | */ |
338 | hdmi_write(hdmi, 0x00, HDMI_AUDIO_SETTING_1); | 341 | switch (pdata->flags & HDMI_SRC_MASK) { |
342 | default: | ||
343 | /* FALL THROUGH */ | ||
344 | case HDMI_SRC_I2S: | ||
345 | data = (0x0 << 3); | ||
346 | break; | ||
347 | case HDMI_SRC_SPDIF: | ||
348 | data = (0x1 << 3); | ||
349 | break; | ||
350 | case HDMI_SRC_DSD: | ||
351 | data = (0x2 << 3); | ||
352 | break; | ||
353 | case HDMI_SRC_HBR: | ||
354 | data = (0x3 << 3); | ||
355 | break; | ||
356 | } | ||
357 | hdmi_write(hdmi, data, HDMI_AUDIO_SETTING_1); | ||
339 | 358 | ||
340 | /* [3:0] set sending channel number for channel status */ | 359 | /* [3:0] set sending channel number for channel status */ |
341 | hdmi_write(hdmi, 0x40, HDMI_AUDIO_SETTING_2); | 360 | hdmi_write(hdmi, 0x40, HDMI_AUDIO_SETTING_2); |