recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch

   1 From ccf7f535d7e809e563812f1c4897bdb9a1ff9233 Mon Sep 17 00:00:00 2001
   2 From: Tomi Valkeinen <tomi.valkeinen@ti.com>
   3 Date: Mon, 4 Apr 2011 10:02:53 +0300
   4 Subject: [PATCH 02/28] OMAP: DSS2: DSI: fix dsi_dump_clocks()
   5
   6 On OMAP4, reading DSI_PLL_CONFIGURATION2 register requires the L3 clock
   7 (CIO_CLK_ICG) to PLL. Currently dsi_dump_clocks() tries to read that
   8 register without enabling the L3 clock, leading to crash if DSI is not
   9 in use.
  10
  11 The status of the bit being read from DSI_PLL_CONFIGURATION2 is
  12 available from dsi_clock_info->use_sys_clk, so we can avoid the whole
  13 problem by just using that.
  14
  15 Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  16 ---
  17  drivers/video/omap2/dss/dsi.c |    6 +-----
  18  1 files changed, 1 insertions(+), 5 deletions(-)
  19
  20 diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
  21 index 8604153..1464ac4 100644
  22 --- a/drivers/video/omap2/dss/dsi.c
  23 +++ b/drivers/video/omap2/dss/dsi.c
  24 @@ -1491,7 +1491,6 @@ void dsi_pll_uninit(void)
  25
  26  void dsi_dump_clocks(struct seq_file *s)
  27  {
  28 -       int clksel;
  29         struct dsi_clock_info *cinfo = &dsi.current_cinfo;
  30         enum dss_clk_source dispc_clk_src, dsi_clk_src;
  31
  32 @@ -1500,13 +1499,10 @@ void dsi_dump_clocks(struct seq_file *s)
  33
  34         enable_clocks(1);
  35
  36 -       clksel = REG_GET(DSI_PLL_CONFIGURATION2, 11, 11);
  37 -
  38         seq_printf(s,   "- DSI PLL -\n");
  39
  40         seq_printf(s,   "dsi pll source = %s\n",
  41 -                       clksel == 0 ?
  42 -                       "dss_sys_clk" : "pclkfree");
  43 +                       cinfo->use_sys_clk ? "dss_sys_clk" : "pclkfree");
  44
  45         seq_printf(s,   "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn);
  46
  47 --
  48 1.6.6.1
  49