diff options
| author | Sumit Semwal | 2011-01-31 17:27:43 +0100 |
|---|---|---|
| committer | Tomi Valkeinen | 2011-03-11 14:46:22 +0100 |
| commit | 872462cdfc74e7b93c09870128d9bb436d4e9804 (patch) | |
| tree | 3334df4774a219b79ae9422c50ea5e2d4be9894c /drivers/video/omap2 | |
| parent | OMAP2,3: DSS2: Get DSS IRQ from platform device (diff) | |
| download | kernel-qcow2-linux-872462cdfc74e7b93c09870128d9bb436d4e9804.tar.gz kernel-qcow2-linux-872462cdfc74e7b93c09870128d9bb436d4e9804.tar.xz kernel-qcow2-linux-872462cdfc74e7b93c09870128d9bb436d4e9804.zip | |
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/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dss/dss.c | 8 |
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) if (r) goto err; - r = dss_get_clock(&dss.dss1_fck, "dss1_fck"); + r = dss_get_clock(&dss.dss1_fck, "fck"); if (r) goto err; - r = dss_get_clock(&dss.dss2_fck, "dss2_fck"); + r = dss_get_clock(&dss.dss2_fck, "sys_clk"); if (r) goto err; - r = dss_get_clock(&dss.dss_54m_fck, "tv_fck"); + r = dss_get_clock(&dss.dss_54m_fck, "tv_clk"); if (r) goto err; - r = dss_get_clock(&dss.dss_96m_fck, "video_fck"); + r = dss_get_clock(&dss.dss_96m_fck, "video_clk"); if (r) goto err; |