aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-11-01 05:36:10 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-11-18 07:32:26 -0500
commit9c15d76200dbd9c0ae5b1c6bfa17cbfdfaa2e2ae (patch)
tree80bdfb7d8331827e824f5b1ed7135af07db1c909
parentd0f58bd3bba3877fb1af4664c4e33273d36f00e4 (diff)
OMAPDSS: simplify dss clk dump
Simplify dss_dump_clocks() so that it doesn't make any presumptions about the DSS fclks nature. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/dss.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index c37d934e1a57..3dea532daf4c 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -264,8 +264,6 @@ const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src)
264 264
265void dss_dump_clocks(struct seq_file *s) 265void dss_dump_clocks(struct seq_file *s)
266{ 266{
267 unsigned long dpll4_ck_rate;
268 unsigned long dpll4_m4_ck_rate;
269 const char *fclk_name, *fclk_real_name; 267 const char *fclk_name, *fclk_real_name;
270 unsigned long fclk_rate; 268 unsigned long fclk_rate;
271 269
@@ -278,21 +276,9 @@ void dss_dump_clocks(struct seq_file *s)
278 fclk_real_name = dss_feat_get_clk_source_name(OMAP_DSS_CLK_SRC_FCK); 276 fclk_real_name = dss_feat_get_clk_source_name(OMAP_DSS_CLK_SRC_FCK);
279 fclk_rate = clk_get_rate(dss.dss_clk); 277 fclk_rate = clk_get_rate(dss.dss_clk);
280 278
281 if (dss.dpll4_m4_ck) { 279 seq_printf(s, "%s (%s) = %lu\n",
282 dpll4_ck_rate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck)); 280 fclk_name, fclk_real_name,
283 dpll4_m4_ck_rate = clk_get_rate(dss.dpll4_m4_ck); 281 fclk_rate);
284
285 seq_printf(s, "dpll4_ck %lu\n", dpll4_ck_rate);
286
287 seq_printf(s, "%s (%s) = %lu / %lu * %d = %lu\n",
288 fclk_name, fclk_real_name, dpll4_ck_rate,
289 dpll4_ck_rate / dpll4_m4_ck_rate,
290 dss.feat->dss_fck_multiplier, fclk_rate);
291 } else {
292 seq_printf(s, "%s (%s) = %lu\n",
293 fclk_name, fclk_real_name,
294 fclk_rate);
295 }
296 282
297 dss_runtime_put(); 283 dss_runtime_put();
298} 284}