提交 63cf28ac 编写于 作者: T Tomi Valkeinen

OMAP: DSS2: fix get_dsi/dispc_clk_source() usage

After changing the selection of DSI and DISPC clock source the users of
get_dsi/dispc_clk_source() functions were left unchanged.
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@nokia.com>
上级 6d2e0bd6
...@@ -2198,7 +2198,7 @@ unsigned long dispc_fclk_rate(void) ...@@ -2198,7 +2198,7 @@ unsigned long dispc_fclk_rate(void)
{ {
unsigned long r = 0; unsigned long r = 0;
if (dss_get_dispc_clk_source() == 0) if (dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK)
r = dss_clk_get_rate(DSS_CLK_FCK1); r = dss_clk_get_rate(DSS_CLK_FCK1);
else else
#ifdef CONFIG_OMAP2_DSS_DSI #ifdef CONFIG_OMAP2_DSS_DSI
...@@ -2251,7 +2251,7 @@ void dispc_dump_clocks(struct seq_file *s) ...@@ -2251,7 +2251,7 @@ void dispc_dump_clocks(struct seq_file *s)
seq_printf(s, "- DISPC -\n"); seq_printf(s, "- DISPC -\n");
seq_printf(s, "dispc fclk source = %s\n", seq_printf(s, "dispc fclk source = %s\n",
dss_get_dispc_clk_source() == 0 ? dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
"dss1_alwon_fclk" : "dsi1_pll_fclk"); "dss1_alwon_fclk" : "dsi1_pll_fclk");
seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate()); seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());
......
...@@ -778,7 +778,7 @@ static unsigned long dsi_fclk_rate(void) ...@@ -778,7 +778,7 @@ static unsigned long dsi_fclk_rate(void)
{ {
unsigned long r; unsigned long r;
if (dss_get_dsi_clk_source() == 0) { if (dss_get_dsi_clk_source() == DSS_SRC_DSS1_ALWON_FCLK) {
/* DSI FCLK source is DSS1_ALWON_FCK, which is dss1_fck */ /* DSI FCLK source is DSS1_ALWON_FCK, which is dss1_fck */
r = dss_clk_get_rate(DSS_CLK_FCK1); r = dss_clk_get_rate(DSS_CLK_FCK1);
} else { } else {
...@@ -1231,17 +1231,19 @@ void dsi_dump_clocks(struct seq_file *s) ...@@ -1231,17 +1231,19 @@ void dsi_dump_clocks(struct seq_file *s)
seq_printf(s, "dsi1_pll_fck\t%-16luregm3 %u\t(%s)\n", seq_printf(s, "dsi1_pll_fck\t%-16luregm3 %u\t(%s)\n",
cinfo->dsi1_pll_fclk, cinfo->dsi1_pll_fclk,
cinfo->regm3, cinfo->regm3,
dss_get_dispc_clk_source() == 0 ? "off" : "on"); dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
"off" : "on");
seq_printf(s, "dsi2_pll_fck\t%-16luregm4 %u\t(%s)\n", seq_printf(s, "dsi2_pll_fck\t%-16luregm4 %u\t(%s)\n",
cinfo->dsi2_pll_fclk, cinfo->dsi2_pll_fclk,
cinfo->regm4, cinfo->regm4,
dss_get_dsi_clk_source() == 0 ? "off" : "on"); dss_get_dsi_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
"off" : "on");
seq_printf(s, "- DSI -\n"); seq_printf(s, "- DSI -\n");
seq_printf(s, "dsi fclk source = %s\n", seq_printf(s, "dsi fclk source = %s\n",
dss_get_dsi_clk_source() == 0 ? dss_get_dsi_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
"dss1_alwon_fclk" : "dsi2_pll_fclk"); "dss1_alwon_fclk" : "dsi2_pll_fclk");
seq_printf(s, "DSI_FCLK\t%lu\n", dsi_fclk_rate()); seq_printf(s, "DSI_FCLK\t%lu\n", dsi_fclk_rate());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册