aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/hdmi.c11
-rw-r--r--include/video/omapdss.h8
2 files changed, 3 insertions, 16 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 72923645dcce..b53de043c03f 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -472,17 +472,12 @@ static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
472 * Input clock is predivided by N + 1 472 * Input clock is predivided by N + 1
473 * out put of which is reference clk 473 * out put of which is reference clk
474 */ 474 */
475 if (dssdev->clocks.hdmi.regn == 0) 475
476 pi->regn = HDMI_DEFAULT_REGN; 476 pi->regn = HDMI_DEFAULT_REGN;
477 else
478 pi->regn = dssdev->clocks.hdmi.regn;
479 477
480 refclk = clkin / pi->regn; 478 refclk = clkin / pi->regn;
481 479
482 if (dssdev->clocks.hdmi.regm2 == 0) 480 pi->regm2 = HDMI_DEFAULT_REGM2;
483 pi->regm2 = HDMI_DEFAULT_REGM2;
484 else
485 pi->regm2 = dssdev->clocks.hdmi.regm2;
486 481
487 /* 482 /*
488 * multiplier is pixel_clk/ref_clk 483 * multiplier is pixel_clk/ref_clk
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 255bcf558f89..2cb2b0e812af 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -591,14 +591,6 @@ struct omap_dss_device {
591 } phy; 591 } phy;
592 592
593 struct { 593 struct {
594 struct {
595 /* regn is one greater than TRM's REGN value */
596 u16 regn;
597 u16 regm2;
598 } hdmi;
599 } clocks;
600
601 struct {
602 struct omap_video_timings timings; 594 struct omap_video_timings timings;
603 595
604 enum omap_dss_dsi_pixel_format dsi_pix_fmt; 596 enum omap_dss_dsi_pixel_format dsi_pix_fmt;