aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/hdmi_phy.c3
-rw-r--r--drivers/video/omap2/dss/ti_hdmi.h15
2 files changed, 15 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/hdmi_phy.c b/drivers/video/omap2/dss/hdmi_phy.c
index 29f7552b4b9a..16feaa80b3b4 100644
--- a/drivers/video/omap2/dss/hdmi_phy.c
+++ b/drivers/video/omap2/dss/hdmi_phy.c
@@ -17,9 +17,6 @@
17#include "dss.h" 17#include "dss.h"
18#include "ti_hdmi.h" 18#include "ti_hdmi.h"
19 19
20#define HDMI_IRQ_LINK_CONNECT (1 << 25)
21#define HDMI_IRQ_LINK_DISCONNECT (1 << 26)
22
23void hdmi_phy_dump(struct hdmi_phy_data *phy, struct seq_file *s) 20void hdmi_phy_dump(struct hdmi_phy_data *phy, struct seq_file *s)
24{ 21{
25#define DUMPPHY(r) seq_printf(s, "%-35s %08x\n", #r,\ 22#define DUMPPHY(r) seq_printf(s, "%-35s %08x\n", #r,\
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index cf096fdb9183..5034080ccfa9 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -49,6 +49,21 @@
49#define HDMI_WP_AUDIO_CTRL 0x88 49#define HDMI_WP_AUDIO_CTRL 0x88
50#define HDMI_WP_AUDIO_DATA 0x8C 50#define HDMI_WP_AUDIO_DATA 0x8C
51 51
52/* HDMI WP IRQ flags */
53
54#define HDMI_IRQ_OCP_TIMEOUT (1 << 4)
55#define HDMI_IRQ_AUDIO_FIFO_UNDERFLOW (1 << 8)
56#define HDMI_IRQ_AUDIO_FIFO_OVERFLOW (1 << 9)
57#define HDMI_IRQ_AUDIO_FIFO_SAMPLE_REQ (1 << 10)
58#define HDMI_IRQ_VIDEO_VSYNC (1 << 16)
59#define HDMI_IRQ_VIDEO_FRAME_DONE (1 << 17)
60#define HDMI_IRQ_PHY_LINE5V_ASSERT (1 << 24)
61#define HDMI_IRQ_LINK_CONNECT (1 << 25)
62#define HDMI_IRQ_LINK_DISCONNECT (1 << 26)
63#define HDMI_IRQ_PLL_LOCK (1 << 29)
64#define HDMI_IRQ_PLL_UNLOCK (1 << 30)
65#define HDMI_IRQ_PLL_RECAL (1 << 31)
66
52/* HDMI PLL */ 67/* HDMI PLL */
53 68
54#define PLLCTRL_PLL_CONTROL 0x0 69#define PLLCTRL_PLL_CONTROL 0x0