Reported-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
drivers/video/sh_mobile_hdmi.c | 10 +++++-----
include/video/sh_mobile_hdmi.h | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index 16187d6..5e855cc 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -396,19 +396,19 @@ static void sh_hdmi_audio_config(struct sh_hdmi *hdmi)
* [6:5] set required down sampling rate if required
* [4:3] set required audio source
*/
- switch (pdata->flags & HDMI_SRC_MASK) {
+ switch (pdata->flags & HDMI_SND_SRC_MASK) {
default:
/* FALL THROUGH */
- case HDMI_SRC_I2S:
+ case HDMI_SND_SRC_I2S:
data = (0x0 << 3);
break;
- case HDMI_SRC_SPDIF:
+ case HDMI_SND_SRC_SPDIF:
data = (0x1 << 3);
break;
- case HDMI_SRC_DSD:
+ case HDMI_SND_SRC_DSD:
data = (0x2 << 3);
break;
- case HDMI_SRC_HBR:
+ case HDMI_SND_SRC_HBR:
data = (0x3 << 3);
break;
}
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 929c2d3..1e1aa54 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -23,11 +23,11 @@ struct device;
*/
/* Audio source select */
-#define HDMI_SRC_MASK (0xF << 0)
-#define HDMI_SRC_I2S (0 << 0) /* default */
-#define HDMI_SRC_SPDIF (1 << 0)
-#define HDMI_SRC_DSD (2 << 0)
-#define HDMI_SRC_HBR (3 << 0)
+#define HDMI_SND_SRC_MASK (0xF << 0)
+#define HDMI_SND_SRC_I2S (0 << 0) /* default */
+#define HDMI_SND_SRC_SPDIF (1 << 0)
+#define HDMI_SND_SRC_DSD (2 << 0)
+#define HDMI_SND_SRC_HBR (3 << 0)
struct sh_mobile_hdmi_info {
struct sh_mobile_lcdc_chan_cfg *lcd_chan;
--
1.7.0.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
