diff options
author | Mythri P K <mythripk@ti.com> | 2011-09-08 15:36:19 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-30 15:16:31 +0200 |
commit | 7b27da548389cede637653033211369a2c9678f7 (patch) | |
tree | 68b7482d61fa2e2048b8e38519a8405878d77ab8 /drivers/video/omap2/dss/hdmi.h | |
parent | OMAP4: DSS2: HDMI: HDMI clean up to pass base_address (diff) | |
download | linux-7b27da548389cede637653033211369a2c9678f7.tar.xz linux-7b27da548389cede637653033211369a2c9678f7.zip |
OMAP4: DSS2: HDMI: Move pll and video configuration
As the pll and the video configuration info are part of the ip_data, pll
and video structures are moved to the ip_data structure. Also the pll and
video configuration functions are modified accordingly to take care of the
structure movement.
Signed-off-by: Mythri P K <mythripk@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/hdmi.h')
-rw-r--r-- | drivers/video/omap2/dss/hdmi.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/video/omap2/dss/hdmi.h b/drivers/video/omap2/dss/hdmi.h index ee37bd932116..d2913f8ee003 100644 --- a/drivers/video/omap2/dss/hdmi.h +++ b/drivers/video/omap2/dss/hdmi.h @@ -218,13 +218,6 @@ enum hdmi_pll_pwr { HDMI_PLLPWRCMD_BOTHON_NOPHYCLK = 3 }; -enum hdmi_clk_refsel { - HDMI_REFSEL_PCLK = 0, - HDMI_REFSEL_REF1 = 1, - HDMI_REFSEL_REF2 = 2, - HDMI_REFSEL_SYSCLK = 3 -}; - enum hdmi_core_inputbus_width { HDMI_INPUT_8BIT = 0, HDMI_INPUT_10BIT = 1, @@ -558,14 +551,6 @@ struct hdmi_video_interface { int tm; /* Timing mode */ }; -struct hdmi_ip_data { - void __iomem *base_wp; /* HDMI wrapper */ - unsigned long core_sys_offset; - unsigned long core_av_offset; - unsigned long pll_offset; - unsigned long phy_offset; -}; - struct hdmi_cm { int code; int mode; @@ -577,6 +562,16 @@ struct hdmi_config { struct hdmi_cm cm; }; +struct hdmi_ip_data { + void __iomem *base_wp; /* HDMI wrapper */ + unsigned long core_sys_offset; + unsigned long core_av_offset; + unsigned long pll_offset; + unsigned long phy_offset; + struct hdmi_config cfg; + struct hdmi_pll_info pll_data; +}; + struct hdmi_audio_format { enum hdmi_stereo_channels stereo_channels; u8 active_chnnls_msk; |