Commit a9a6500b authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAP: DSS2: DSI: fix dsi_dump_clocks()

On OMAP4, reading DSI_PLL_CONFIGURATION2 register requires the L3 clock
(CIO_CLK_ICG) to PLL. Currently dsi_dump_clocks() tries to read that
register without enabling the L3 clock, leading to crash if DSI is not
in use.

The status of the bit being read from DSI_PLL_CONFIGURATION2 is
available from dsi_clock_info->use_sys_clk, so we can avoid the whole
problem by just using that.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent b2765092
...@@ -1491,7 +1491,6 @@ void dsi_pll_uninit(void) ...@@ -1491,7 +1491,6 @@ void dsi_pll_uninit(void)
void dsi_dump_clocks(struct seq_file *s) void dsi_dump_clocks(struct seq_file *s)
{ {
int clksel;
struct dsi_clock_info *cinfo = &dsi.current_cinfo; struct dsi_clock_info *cinfo = &dsi.current_cinfo;
enum dss_clk_source dispc_clk_src, dsi_clk_src; enum dss_clk_source dispc_clk_src, dsi_clk_src;
...@@ -1500,13 +1499,10 @@ void dsi_dump_clocks(struct seq_file *s) ...@@ -1500,13 +1499,10 @@ void dsi_dump_clocks(struct seq_file *s)
enable_clocks(1); enable_clocks(1);
clksel = REG_GET(DSI_PLL_CONFIGURATION2, 11, 11);
seq_printf(s, "- DSI PLL -\n"); seq_printf(s, "- DSI PLL -\n");
seq_printf(s, "dsi pll source = %s\n", seq_printf(s, "dsi pll source = %s\n",
clksel == 0 ? cinfo->use_sys_clk ? "dss_sys_clk" : "pclkfree");
"dss_sys_clk" : "pclkfree");
seq_printf(s, "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn); seq_printf(s, "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment