diff options
| author | Erik Gilling <konkers@android.com> | 2011-10-10 17:21:42 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-10-10 17:21:42 -0700 |
| commit | 1185a83763c2234b85a94d72731d3e8aba762642 (patch) | |
| tree | 137d4f9dd6638078f8c3618d34278dfa5cbb4d69 /include | |
| parent | 513de6f79e11a753e8a90b22fcb571ede85f9d3c (diff) | |
| parent | 0d028b7ea9411f2dd6032931248eb27516f6c893 (diff) | |
| download | kernel_samsung_espresso10-1185a83763c2234b85a94d72731d3e8aba762642.zip kernel_samsung_espresso10-1185a83763c2234b85a94d72731d3e8aba762642.tar.gz kernel_samsung_espresso10-1185a83763c2234b85a94d72731d3e8aba762642.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/hdmi_ti_4xxx_ip.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/video/hdmi_ti_4xxx_ip.h b/include/video/hdmi_ti_4xxx_ip.h index 0d5b4fd..992c704 100644 --- a/include/video/hdmi_ti_4xxx_ip.h +++ b/include/video/hdmi_ti_4xxx_ip.h @@ -21,6 +21,10 @@ #ifndef _HDMI_TI_4xxx_ #define _HDMI_TI_4xxx_ +#define HDMI_HPD_LOW 0x10 +#define HDMI_HPD_HIGH 0x20 +#define HDMI_BCAP 0x40 +#define HDMI_RI_ERR 0x80 enum hdmi_pll_pwr { HDMI_PLLPWRCMD_ALLOFF = 0, HDMI_PLLPWRCMD_PLLONLY = 1, @@ -353,7 +357,7 @@ enum hdmi_core_infoframe { int hdmi_ti_4xxx_phy_init(struct hdmi_ip_data *ip_data); -void hdmi_ti_4xxx_phy_off(struct hdmi_ip_data *ip_data); +void hdmi_ti_4xxx_phy_off(struct hdmi_ip_data *ip_data, bool set_mode); int read_ti_4xxx_edid(struct hdmi_ip_data *ip_data, u8 *pedid, u16 max_length); void hdmi_ti_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start); int hdmi_ti_4xxx_pll_program(struct hdmi_ip_data *ip_data, @@ -361,6 +365,9 @@ int hdmi_ti_4xxx_pll_program(struct hdmi_ip_data *ip_data, int hdmi_ti_4xxx_set_pll_pwr(struct hdmi_ip_data *ip_data, enum hdmi_pll_pwr val); void hdmi_ti_4xxx_basic_configure(struct hdmi_ip_data *ip_data, struct hdmi_config *cfg); +int hdmi_ti_4xxx_rxdet(struct hdmi_ip_data *ip_data); +int hdmi_ti_4xxx_wp_get_video_state(struct hdmi_ip_data *ip_data); +u32 hdmi_ti_4xxx_irq_handler(struct hdmi_ip_data *ip_data); void hdmi_ti_4xxx_dump_regs(struct hdmi_ip_data *ip_data, struct seq_file *s); int hdmi_ti_4xxx_config_audio_acr(struct hdmi_ip_data *ip_data, u32 sample_freq, u32 *n, u32 *cts, u32 pclk); @@ -374,4 +381,5 @@ void hdmi_ti_4xxx_core_audio_config(struct hdmi_ip_data *ip_data, void hdmi_ti_4xxx_core_audio_infoframe_config(struct hdmi_ip_data *ip_data, struct hdmi_core_infoframe_audio *info_aud); void hdmi_ti_4xxx_audio_enable(struct hdmi_ip_data *ip_data, bool idle); +int hdmi_ti_4xxx_set_wait_soft_reset(struct hdmi_ip_data *ip_data); #endif |