1 files changed, 29 insertions, 25 deletions
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index cd833bbaac3d..c332e7ddfce1 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -31,33 +31,37 @@
 /* DSS has feature id */
 enum dss_feat_id {
-        FEAT_LCDENABLEPOL               = 1 << 3,
+        FEAT_LCDENABLEPOL,
-        FEAT_LCDENABLESIGNAL            = 1 << 4,
+        FEAT_LCDENABLESIGNAL,
-        FEAT_PCKFREEENABLE              = 1 << 5,
+        FEAT_PCKFREEENABLE,
-        FEAT_FUNCGATED                  = 1 << 6,
+        FEAT_FUNCGATED,
-        FEAT_MGR_LCD2                   = 1 << 7,
+        FEAT_MGR_LCD2,
-        FEAT_LINEBUFFERSPLIT            = 1 << 8,
+        FEAT_LINEBUFFERSPLIT,
-        FEAT_ROWREPEATENABLE            = 1 << 9,
+        FEAT_ROWREPEATENABLE,
-        FEAT_RESIZECONF                 = 1 << 10,
+        FEAT_RESIZECONF,
        /* Independent core clk divider */
-        FEAT_CORE_CLK_DIV               = 1 << 11,
+        FEAT_CORE_CLK_DIV,
-        FEAT_LCD_CLK_SRC                = 1 << 12,
+        FEAT_LCD_CLK_SRC,
        /* DSI-PLL power command 0x3 is not working */
-        FEAT_DSI_PLL_PWR_BUG            = 1 << 13,
+        FEAT_DSI_PLL_PWR_BUG,
-        FEAT_DSI_PLL_FREQSEL            = 1 << 14,
+        FEAT_DSI_PLL_FREQSEL,
-        FEAT_DSI_DCS_CMD_CONFIG_VC      = 1 << 15,
+        FEAT_DSI_DCS_CMD_CONFIG_VC,
-        FEAT_DSI_VC_OCP_WIDTH           = 1 << 16,
+        FEAT_DSI_VC_OCP_WIDTH,
-        FEAT_DSI_REVERSE_TXCLKESC       = 1 << 17,
+        FEAT_DSI_REVERSE_TXCLKESC,
-        FEAT_DSI_GNQ                    = 1 << 18,
+        FEAT_DSI_GNQ,
-        FEAT_HDMI_CTS_SWMODE            = 1 << 19,
+        FEAT_HDMI_CTS_SWMODE,
-        FEAT_HANDLE_UV_SEPARATE         = 1 << 20,
+        FEAT_HDMI_AUDIO_USE_MCLK,
-        FEAT_ATTR2                      = 1 << 21,
+        FEAT_HANDLE_UV_SEPARATE,
-        FEAT_VENC_REQUIRES_TV_DAC_CLK   = 1 << 22,
+        FEAT_ATTR2,
-        FEAT_CPR                        = 1 << 23,
+        FEAT_VENC_REQUIRES_TV_DAC_CLK,
-        FEAT_PRELOAD                    = 1 << 24,
+        FEAT_CPR,
-        FEAT_FIR_COEF_V                 = 1 << 25,
+        FEAT_PRELOAD,
-        FEAT_ALPHA_FIXED_ZORDER         = 1 << 26,
+        FEAT_FIR_COEF_V,
-        FEAT_ALPHA_FREE_ZORDER          = 1 << 27,
+        FEAT_ALPHA_FIXED_ZORDER,
+        FEAT_ALPHA_FREE_ZORDER,
+        FEAT_FIFO_MERGE,
+        /* An unknown HW bug causing the normal FIFO thresholds not to work */
+        FEAT_OMAP3_DSI_FIFO_BUG,
 };
 /* DSS register field id */

diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h index cd833bbaac3d..c332e7ddfce1 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/drivers/video/omap2/dss/dss_features.h
@@ -31,33 +31,37 @@
31		31
32	/* DSS has feature id */	32	/* DSS has feature id */
33	enum dss_feat_id {	33	enum dss_feat_id {
34	FEAT_LCDENABLEPOL = 1 << 3,	34	FEAT_LCDENABLEPOL,
35	FEAT_LCDENABLESIGNAL = 1 << 4,	35	FEAT_LCDENABLESIGNAL,
36	FEAT_PCKFREEENABLE = 1 << 5,	36	FEAT_PCKFREEENABLE,
37	FEAT_FUNCGATED = 1 << 6,	37	FEAT_FUNCGATED,
38	FEAT_MGR_LCD2 = 1 << 7,	38	FEAT_MGR_LCD2,
39	FEAT_LINEBUFFERSPLIT = 1 << 8,	39	FEAT_LINEBUFFERSPLIT,
40	FEAT_ROWREPEATENABLE = 1 << 9,	40	FEAT_ROWREPEATENABLE,
41	FEAT_RESIZECONF = 1 << 10,	41	FEAT_RESIZECONF,
42	/* Independent core clk divider */	42	/* Independent core clk divider */
43	FEAT_CORE_CLK_DIV = 1 << 11,	43	FEAT_CORE_CLK_DIV,
44	FEAT_LCD_CLK_SRC = 1 << 12,	44	FEAT_LCD_CLK_SRC,
45	/* DSI-PLL power command 0x3 is not working */	45	/* DSI-PLL power command 0x3 is not working */
46	FEAT_DSI_PLL_PWR_BUG = 1 << 13,	46	FEAT_DSI_PLL_PWR_BUG,
47	FEAT_DSI_PLL_FREQSEL = 1 << 14,	47	FEAT_DSI_PLL_FREQSEL,
48	FEAT_DSI_DCS_CMD_CONFIG_VC = 1 << 15,	48	FEAT_DSI_DCS_CMD_CONFIG_VC,
49	FEAT_DSI_VC_OCP_WIDTH = 1 << 16,	49	FEAT_DSI_VC_OCP_WIDTH,
50	FEAT_DSI_REVERSE_TXCLKESC = 1 << 17,	50	FEAT_DSI_REVERSE_TXCLKESC,
51	FEAT_DSI_GNQ = 1 << 18,	51	FEAT_DSI_GNQ,
52	FEAT_HDMI_CTS_SWMODE = 1 << 19,	52	FEAT_HDMI_CTS_SWMODE,
53	FEAT_HANDLE_UV_SEPARATE = 1 << 20,	53	FEAT_HDMI_AUDIO_USE_MCLK,
54	FEAT_ATTR2 = 1 << 21,	54	FEAT_HANDLE_UV_SEPARATE,
55	FEAT_VENC_REQUIRES_TV_DAC_CLK = 1 << 22,	55	FEAT_ATTR2,
56	FEAT_CPR = 1 << 23,	56	FEAT_VENC_REQUIRES_TV_DAC_CLK,
57	FEAT_PRELOAD = 1 << 24,	57	FEAT_CPR,
58	FEAT_FIR_COEF_V = 1 << 25,	58	FEAT_PRELOAD,
59	FEAT_ALPHA_FIXED_ZORDER = 1 << 26,	59	FEAT_FIR_COEF_V,
60	FEAT_ALPHA_FREE_ZORDER = 1 << 27,	60	FEAT_ALPHA_FIXED_ZORDER,
		61	FEAT_ALPHA_FREE_ZORDER,
		62	FEAT_FIFO_MERGE,
		63	/* An unknown HW bug causing the normal FIFO thresholds not to work */
		64	FEAT_OMAP3_DSI_FIFO_BUG,
61	};	65	};
62		66
63	/* DSS register field id */	67	/* DSS register field id */