aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@ti.com>2011-01-31 11:27:43 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 08:46:22 -0500
commit872462cdfc74e7b93c09870128d9bb436d4e9804 (patch)
tree3334df4774a219b79ae9422c50ea5e2d4be9894c /drivers
parentef631f82500390b3dfc20b16214e53c443d675a4 (diff)
OMAP2PLUS: clocks: Align DSS clock names and roles
Currently, clock database has <dev, clock-name> tuples for DSS2. Because of this, the clock names are different across different OMAP platforms. This patch aligns the DSS2 clock names and roles across OMAP 2420, 2430, 3xxx, 44xx platforms in the clock databases, hwmod databases for opt-clocks, and DSS clock handling. This ensures that clk_get/put/enable/disable APIs in DSS can use uniform role names. Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/dss.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index a00733d6436a..56d37bfefd4d 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -759,19 +759,19 @@ static int dss_get_clocks(void)
759 if (r) 759 if (r)
760 goto err; 760 goto err;
761 761
762 r = dss_get_clock(&dss.dss1_fck, "dss1_fck"); 762 r = dss_get_clock(&dss.dss1_fck, "fck");
763 if (r) 763 if (r)
764 goto err; 764 goto err;
765 765
766 r = dss_get_clock(&dss.dss2_fck, "dss2_fck"); 766 r = dss_get_clock(&dss.dss2_fck, "sys_clk");
767 if (r) 767 if (r)
768 goto err; 768 goto err;
769 769
770 r = dss_get_clock(&dss.dss_54m_fck, "tv_fck"); 770 r = dss_get_clock(&dss.dss_54m_fck, "tv_clk");
771 if (r) 771 if (r)
772 goto err; 772 goto err;
773 773
774 r = dss_get_clock(&dss.dss_96m_fck, "video_fck"); 774 r = dss_get_clock(&dss.dss_96m_fck, "video_clk");
775 if (r) 775 if (r)
776 goto err; 776 goto err;
777 777