Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 271410
b: refs/heads/master
c: 176b578
h: refs/heads/master
v: v3
  • Loading branch information
Mythri P K authored and Tomi Valkeinen committed Sep 30, 2011
1 parent 77b6a5e commit 5baab75
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7334167bf18e708e275164a3c44bb3f0c193d0c4
refs/heads/master: 176b578b1a0e1b7ccdc746c3962f2a56aaf45456
18 changes: 9 additions & 9 deletions trunk/drivers/video/omap2/dss/hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ static void hdmi_read_edid(struct omap_video_timings *dp)
memset(hdmi.edid, 0, HDMI_EDID_MAX_LENGTH);

if (!hdmi.edid_set)
ret = read_edid(&hdmi.ip_data, hdmi.edid,
ret = ti_hdmi_4xxx_read_edid(&hdmi.ip_data, hdmi.edid,
HDMI_EDID_MAX_LENGTH);
if (!ret) {
if (!memcmp(hdmi.edid, edid_header, sizeof(edid_header))) {
Expand Down Expand Up @@ -480,24 +480,24 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)

hdmi_compute_pll(dssdev, phy, &hdmi.ip_data.pll_data);

hdmi_wp_video_start(&hdmi.ip_data, 0);
ti_hdmi_4xxx_wp_video_start(&hdmi.ip_data, 0);

/* config the PLL and PHY hdmi_set_pll_pwrfirst */
r = hdmi_pll_program(&hdmi.ip_data);
r = ti_hdmi_4xxx_pll_enable(&hdmi.ip_data);
if (r) {
DSSDBG("Failed to lock PLL\n");
goto err;
}

r = hdmi_phy_init(&hdmi.ip_data);
r = ti_hdmi_4xxx_phy_enable(&hdmi.ip_data);
if (r) {
DSSDBG("Failed to start PHY\n");
goto err;
}

hdmi.ip_data.cfg.cm.mode = hdmi.mode;
hdmi.ip_data.cfg.cm.code = hdmi.code;
hdmi_basic_configure(&hdmi.ip_data);
ti_hdmi_4xxx_basic_configure(&hdmi.ip_data);

/* Make selection of HDMI in DSS */
dss_select_hdmi_venc_clk_source(DSS_HDMI_M_PCLK);
Expand All @@ -519,7 +519,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)

dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1);

hdmi_wp_video_start(&hdmi.ip_data, 1);
ti_hdmi_4xxx_wp_video_start(&hdmi.ip_data, 1);

return 0;
err:
Expand All @@ -531,9 +531,9 @@ static void hdmi_power_off(struct omap_dss_device *dssdev)
{
dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0);

hdmi_wp_video_start(&hdmi.ip_data, 0);
hdmi_phy_off(&hdmi.ip_data);
hdmi_set_pll_pwr(&hdmi.ip_data, HDMI_PLLPWRCMD_ALLOFF);
ti_hdmi_4xxx_wp_video_start(&hdmi.ip_data, 0);
ti_hdmi_4xxx_phy_disable(&hdmi.ip_data);
ti_hdmi_4xxx_pll_disable(&hdmi.ip_data);
hdmi_runtime_put();

hdmi.edid_set = 0;
Expand Down
15 changes: 8 additions & 7 deletions trunk/drivers/video/omap2/dss/ti_hdmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,12 @@ struct hdmi_ip_data {
struct hdmi_config cfg;
struct hdmi_pll_info pll_data;
};
int hdmi_phy_init(struct hdmi_ip_data *ip_data);
void hdmi_phy_off(struct hdmi_ip_data *ip_data);
int read_edid(struct hdmi_ip_data *ip_data, u8 *pedid, u16 max_length);
void hdmi_wp_video_start(struct hdmi_ip_data *ip_data, bool start);
int hdmi_pll_program(struct hdmi_ip_data *ip_data);
int hdmi_set_pll_pwr(struct hdmi_ip_data *ip_data, enum hdmi_pll_pwr val);
void hdmi_basic_configure(struct hdmi_ip_data *ip_data);
int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data,
u8 *pedid, u16 max_length);
void ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start);
int ti_hdmi_4xxx_pll_enable(struct hdmi_ip_data *ip_data);
void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data);
void ti_hdmi_4xxx_basic_configure(struct hdmi_ip_data *ip_data);
#endif
20 changes: 13 additions & 7 deletions trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static int hdmi_set_phy_pwr(struct hdmi_ip_data *ip_data, enum hdmi_phy_pwr val)
}

/* PLL_PWR_CMD */
int hdmi_set_pll_pwr(struct hdmi_ip_data *ip_data, enum hdmi_pll_pwr val)
static int hdmi_set_pll_pwr(struct hdmi_ip_data *ip_data, enum hdmi_pll_pwr val)
{
/* Command for power control of HDMI PLL */
REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_PWR_CTRL, val, 3, 2);
Expand Down Expand Up @@ -194,7 +194,7 @@ static int hdmi_pll_reset(struct hdmi_ip_data *ip_data)
return 0;
}

int hdmi_pll_program(struct hdmi_ip_data *ip_data)
int ti_hdmi_4xxx_pll_enable(struct hdmi_ip_data *ip_data)
{
u16 r = 0;

Expand All @@ -217,7 +217,12 @@ int hdmi_pll_program(struct hdmi_ip_data *ip_data)
return 0;
}

int hdmi_phy_init(struct hdmi_ip_data *ip_data)
void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data)
{
hdmi_set_pll_pwr(ip_data, HDMI_PLLPWRCMD_ALLOFF);
}

int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
{
u16 r = 0;
void __iomem *phy_base = hdmi_phy_base(ip_data);
Expand Down Expand Up @@ -254,7 +259,7 @@ int hdmi_phy_init(struct hdmi_ip_data *ip_data)
return 0;
}

void hdmi_phy_off(struct hdmi_ip_data *ip_data)
void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data)
{
hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
}
Expand Down Expand Up @@ -360,7 +365,8 @@ static int hdmi_core_ddc_edid(struct hdmi_ip_data *ip_data,
return 0;
}

int read_edid(struct hdmi_ip_data *ip_data, u8 *pedid, u16 max_length)
int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data,
u8 *pedid, u16 max_length)
{
int r = 0, n = 0, i = 0;
int max_ext_blocks = (max_length / 128) - 1;
Expand Down Expand Up @@ -613,7 +619,7 @@ static void hdmi_wp_init(struct omap_video_timings *timings,

}

void hdmi_wp_video_start(struct hdmi_ip_data *ip_data, bool start)
void ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start)
{
REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_CFG, start, 31, 31);
}
Expand Down Expand Up @@ -680,7 +686,7 @@ static void hdmi_wp_video_config_timing(struct hdmi_ip_data *ip_data,
hdmi_write_reg(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_TIMING_V, timing_v);
}

void hdmi_basic_configure(struct hdmi_ip_data *ip_data)
void ti_hdmi_4xxx_basic_configure(struct hdmi_ip_data *ip_data)
{
/* HDMI */
struct omap_video_timings video_timing;
Expand Down

0 comments on commit 5baab75

Please sign in to comment.