From 01e51525a9f23db07dc7af37fee928d6e8f13fe5 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 12 Feb 2013 15:15:21 +0200
Subject: [PATCH] --- yaml --- r: 371344 b: refs/heads/master c:
 4fdfdf062d896c0afa18aa2d977a933e38c7c96c h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/video/omap2/dss/hdmi.c | 11 +++--------
 trunk/include/video/omapdss.h        |  8 --------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index fc9a6d9f4f07..a0355672b9a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0d269ec0bfab89f7b025bf6e1e596e9a6f9d999
+refs/heads/master: 4fdfdf062d896c0afa18aa2d977a933e38c7c96c
diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c
index 72923645dcce..b53de043c03f 100644
--- a/trunk/drivers/video/omap2/dss/hdmi.c
+++ b/trunk/drivers/video/omap2/dss/hdmi.c
@@ -472,17 +472,12 @@ static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
 	 * Input clock is predivided by N + 1
 	 * out put of which is reference clk
 	 */
-	if (dssdev->clocks.hdmi.regn == 0)
-		pi->regn = HDMI_DEFAULT_REGN;
-	else
-		pi->regn = dssdev->clocks.hdmi.regn;
+
+	pi->regn = HDMI_DEFAULT_REGN;
 
 	refclk = clkin / pi->regn;
 
-	if (dssdev->clocks.hdmi.regm2 == 0)
-		pi->regm2 = HDMI_DEFAULT_REGM2;
-	else
-		pi->regm2 = dssdev->clocks.hdmi.regm2;
+	pi->regm2 = HDMI_DEFAULT_REGM2;
 
 	/*
 	 * multiplier is pixel_clk/ref_clk
diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h
index 255bcf558f89..2cb2b0e812af 100644
--- a/trunk/include/video/omapdss.h
+++ b/trunk/include/video/omapdss.h
@@ -590,14 +590,6 @@ struct omap_dss_device {
 		} venc;
 	} phy;
 
-	struct {
-		struct {
-			/* regn is one greater than TRM's REGN value */
-			u16 regn;
-			u16 regm2;
-		} hdmi;
-	} clocks;
-
 	struct {
 		struct omap_video_timings timings;