aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/sh_mobile_hdmi.c7
-rw-r--r--include/video/sh_mobile_hdmi.h8
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index e201d6fea2d6..0bc39bc976a8 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -1186,6 +1186,13 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
1186 pm_runtime_enable(&pdev->dev); 1186 pm_runtime_enable(&pdev->dev);
1187 pm_runtime_get_sync(&pdev->dev); 1187 pm_runtime_get_sync(&pdev->dev);
1188 1188
1189 /* init interrupt polarity */
1190 if (pdata->flags & HDMI_OUTPUT_PUSH_PULL)
1191 hdmi_bit_set(hdmi, 0x02, 0x02, HDMI_SYSTEM_CTRL);
1192
1193 if (pdata->flags & HDMI_OUTPUT_POLARITY_HI)
1194 hdmi_bit_set(hdmi, 0x01, 0x01, HDMI_SYSTEM_CTRL);
1195
1189 /* Product and revision IDs are 0 in sh-mobile version */ 1196 /* Product and revision IDs are 0 in sh-mobile version */
1190 dev_info(&pdev->dev, "Detected HDMI controller 0x%x:0x%x\n", 1197 dev_info(&pdev->dev, "Detected HDMI controller 0x%x:0x%x\n",
1191 hdmi_read(hdmi, HDMI_PRODUCT_ID), hdmi_read(hdmi, HDMI_REVISION_ID)); 1198 hdmi_read(hdmi, HDMI_PRODUCT_ID), hdmi_read(hdmi, HDMI_REVISION_ID));
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 728f9de9c258..2699635a99ef 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -18,9 +18,10 @@ struct clk;
18/* 18/*
19 * flags format 19 * flags format
20 * 20 *
21 * 0x0000000A 21 * 0x000000BA
22 * 22 *
23 * A: Audio source select 23 * A: Audio source select
24 * B: Int output option
24 */ 25 */
25 26
26/* Audio source select */ 27/* Audio source select */
@@ -30,6 +31,11 @@ struct clk;
30#define HDMI_SND_SRC_DSD (2 << 0) 31#define HDMI_SND_SRC_DSD (2 << 0)
31#define HDMI_SND_SRC_HBR (3 << 0) 32#define HDMI_SND_SRC_HBR (3 << 0)
32 33
34/* Int output option */
35#define HDMI_OUTPUT_PUSH_PULL (1 << 4) /* System control : output mode */
36#define HDMI_OUTPUT_POLARITY_HI (1 << 5) /* System control : output polarity */
37
38
33struct sh_mobile_hdmi_info { 39struct sh_mobile_hdmi_info {
34 unsigned int flags; 40 unsigned int flags;
35 long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq, 41 long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,