3.0-stable patches

added patches:
	omap-dss2-hdmi-use-default-dividers.patch

diff --git a/queue-3.0/omap-dss2-hdmi-use-default-dividers.patch b/queue-3.0/omap-dss2-hdmi-use-default-dividers.patch
new file mode 100644 (file)
index 0000000..6ae5cc8
--- /dev/null
+++ b/queue-3.0/omap-dss2-hdmi-use-default-dividers.patch
@@ -0,0 +1,78 @@
+From 8d88767a4377171752c22ac39bcb2b505eb751da Mon Sep 17 00:00:00 2001
+From: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Date: Mon, 22 Aug 2011 13:02:52 +0300
+Subject: OMAP: DSS2: HDMI: use default dividers
+
+From: Tomi Valkeinen <tomi.valkeinen@ti.com>
+
+commit 8d88767a4377171752c22ac39bcb2b505eb751da upstream.
+
+Use default regn and regm2 dividers in the hdmi driver if the board file
+does not define them.
+
+Cc: Mythri P K <mythripk@ti.com>
+Acked-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-omap2/board-4430sdp.c |    9 ---------
+ drivers/video/omap2/dss/hdmi.c      |   15 +++++++++++++--
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+--- a/arch/arm/mach-omap2/board-4430sdp.c
++++ b/arch/arm/mach-omap2/board-4430sdp.c
+@@ -617,15 +617,6 @@ static struct omap_dss_device sdp4430_hd
+       .name = "hdmi",
+       .driver_name = "hdmi_panel",
+       .type = OMAP_DISPLAY_TYPE_HDMI,
+-      .clocks = {
+-              .dispc  = {
+-                      .dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK,
+-              },
+-              .hdmi   = {
+-                      .regn   = 15,
+-                      .regm2  = 1,
+-              },
+-      },
+       .platform_enable = sdp4430_panel_enable_hdmi,
+       .platform_disable = sdp4430_panel_disable_hdmi,
+       .channel = OMAP_DSS_CHANNEL_DIGIT,
+--- a/drivers/video/omap2/dss/hdmi.c
++++ b/drivers/video/omap2/dss/hdmi.c
+@@ -40,6 +40,9 @@
+ #include "hdmi.h"
+ #include "dss_features.h"
+ 
++#define HDMI_DEFAULT_REGN 15
++#define HDMI_DEFAULT_REGM2 1
++
+ static struct {
+       struct mutex lock;
+       struct omap_display_platform_data *pdata;
+@@ -1069,7 +1072,11 @@ static void hdmi_compute_pll(struct omap
+        * Input clock is predivided by N + 1
+        * out put of which is reference clk
+        */
+-      pi->regn = dssdev->clocks.hdmi.regn;
++      if (dssdev->clocks.hdmi.regn == 0)
++              pi->regn = HDMI_DEFAULT_REGN;
++      else
++              pi->regn = dssdev->clocks.hdmi.regn;
++
+       refclk = clkin / (pi->regn + 1);
+ 
+       /*
+@@ -1077,7 +1084,11 @@ static void hdmi_compute_pll(struct omap
+        * Multiplying by 100 to avoid fractional part removal
+        */
+       pi->regm = (phy * 100 / (refclk)) / 100;
+-      pi->regm2 = dssdev->clocks.hdmi.regm2;
++
++      if (dssdev->clocks.hdmi.regm2 == 0)
++              pi->regm2 = HDMI_DEFAULT_REGM2;
++      else
++              pi->regm2 = dssdev->clocks.hdmi.regm2;
+ 
+       /*
+        * fractional multiplier is remainder of the difference between

diff --git a/queue-3.0/series b/queue-3.0/series
index 700d96a512255776d4bf740c52fb808089d183f5..8d350237ce21594e1d8690fd90bb7de5c6d39a40 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -43,4 +43,5 @@ drm-i915-gen7-work-around-a-system-hang-on-ivb.patch
 drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch
 arm-orion-fix-usb-phy-for-orion5x.patch
 arm-orion-fix-orion5x-gpio-regression-from-mpp-cleanup.patch
+omap-dss2-hdmi-use-default-dividers.patch
 omap-4430sdp-panda-use-gpio_free_array-to-free-hdmi-gpios.patch