diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-06-06 10:16:51 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-06-06 10:16:51 +0300 |
| commit | ecf140dfc3fe169aaff8f5561d345f6b96d7b476 (patch) | |
| tree | 5e360dedcb193a4b321abf427f1629a7c35a5bf0 /include/video | |
| parent | 449c5e9c33fd03625e12e3ed32b84bbbb9243d99 (diff) | |
| parent | 31dca077056afd0a6089b9eaca1e4e485acc1ddc (diff) | |
| download | linux-ecf140dfc3fe169aaff8f5561d345f6b96d7b476.tar.gz linux-ecf140dfc3fe169aaff8f5561d345f6b96d7b476.tar.bz2 linux-ecf140dfc3fe169aaff8f5561d345f6b96d7b476.zip | |
Merge branch '4.8/omapdrm-pll' (omapdrm PLL work)
Merge omapdrm PLL work, which makes it possible to use the DSS PLLs in a
versatile manner, for example, HDMI PLL can be used for LCDs.
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/omapdss.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 8e14ad7327c9..6bd9d03b1030 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -195,25 +195,6 @@ enum omap_overlay_caps { OMAP_DSS_OVL_CAP_REPLICATION = 1 << 5, }; -enum omap_overlay_manager_caps { - OMAP_DSS_DUMMY_VALUE, /* add a dummy value to prevent compiler error */ -}; - -enum omap_dss_clk_source { - OMAP_DSS_CLK_SRC_FCK = 0, /* OMAP2/3: DSS1_ALWON_FCLK - * OMAP4: DSS_FCLK */ - OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC, /* OMAP3: DSI1_PLL_FCLK - * OMAP4: PLL1_CLK1 */ - OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI, /* OMAP3: DSI2_PLL_FCLK - * OMAP4: PLL1_CLK2 */ - OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC, /* OMAP4: PLL2_CLK1 */ - OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI, /* OMAP4: PLL2_CLK2 */ -}; - -enum omap_hdmi_flags { - OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0, -}; - enum omap_dss_output_id { OMAP_DSS_OUTPUT_DPI = 1 << 0, OMAP_DSS_OUTPUT_DBI = 1 << 1, @@ -463,7 +444,6 @@ struct omap_overlay_manager { /* static fields */ const char *name; enum omap_channel id; - enum omap_overlay_manager_caps caps; struct list_head overlays; enum omap_display_type supported_displays; enum omap_dss_output_id supported_outputs; |