aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/sh_mobile_hdmi.c18
-rw-r--r--include/video/sh_mobile_hdmi.h10
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index 0acd850f73b5..beb04ef5fd0b 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -389,20 +389,20 @@ static void sh_hdmi_audio_config(struct sh_hdmi *hdmi)
389 * [6:5] set required down sampling rate if required 389 * [6:5] set required down sampling rate if required
390 * [4:3] set required audio source 390 * [4:3] set required audio source
391 */ 391 */
392 switch (pdata->flags & HDMI_SRC_MASK) { 392 switch (pdata->flags & HDMI_SND_SRC_MASK) {
393 default: 393 default:
394 /* fall through */ 394 /* fall through */
395 case HDMI_SRC_I2S: 395 case HDMI_SND_SRC_I2S:
396 data = (0x0 << 3); 396 data = 0x0 << 3;
397 break; 397 break;
398 case HDMI_SRC_SPDIF: 398 case HDMI_SND_SRC_SPDIF:
399 data = (0x1 << 3); 399 data = 0x1 << 3;
400 break; 400 break;
401 case HDMI_SRC_DSD: 401 case HDMI_SND_SRC_DSD:
402 data = (0x2 << 3); 402 data = 0x2 << 3;
403 break; 403 break;
404 case HDMI_SRC_HBR: 404 case HDMI_SND_SRC_HBR:
405 data = (0x3 << 3); 405 data = 0x3 << 3;
406 break; 406 break;
407 } 407 }
408 hdmi_write(hdmi, data, HDMI_AUDIO_SETTING_1); 408 hdmi_write(hdmi, data, HDMI_AUDIO_SETTING_1);
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 929c2d3147bc..1e1aa54ab2e4 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -23,11 +23,11 @@ struct device;
23 */ 23 */
24 24
25/* Audio source select */ 25/* Audio source select */
26#define HDMI_SRC_MASK (0xF << 0) 26#define HDMI_SND_SRC_MASK (0xF << 0)
27#define HDMI_SRC_I2S (0 << 0) /* default */ 27#define HDMI_SND_SRC_I2S (0 << 0) /* default */
28#define HDMI_SRC_SPDIF (1 << 0) 28#define HDMI_SND_SRC_SPDIF (1 << 0)
29#define HDMI_SRC_DSD (2 << 0) 29#define HDMI_SND_SRC_DSD (2 << 0)
30#define HDMI_SRC_HBR (3 << 0) 30#define HDMI_SND_SRC_HBR (3 << 0)
31 31
32struct sh_mobile_hdmi_info { 32struct sh_mobile_hdmi_info {
33 struct sh_mobile_lcdc_chan_cfg *lcd_chan; 33 struct sh_mobile_lcdc_chan_cfg *lcd_chan;