Re: [PATCH v3 1/4] OMAP2PLUS: clocks: Align DSS clock names and roles

[Paul Walmsley]

On Mon, 31 Jan 2011, Sumit Semwal wrote:

> Currently, clock database has  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 

Based on a quick glance, this is 

Acked-by: Paul Walmsley 

Tomi or Tony, feel free to take this


- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3 1/4] OMAP2PLUS: clocks: Align DSS clock names and roles

[Sumit Semwal]

Currently, clock database has  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 
---
 arch/arm/mach-omap2/clock2420_data.c   |6 +++---
 arch/arm/mach-omap2/clock2430_data.c   |6 +++---
 arch/arm/mach-omap2/clock3xxx_data.c   |   10 +-
 arch/arm/mach-omap2/clock44xx_data.c   |   10 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |2 +-
 drivers/video/omap2/dss/dss.c  |8 
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/arch/arm/mach-omap2/clock2420_data.c 
b/arch/arm/mach-omap2/clock2420_data.c
index d2abc2f..3c1712b 100644
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1787,9 +1787,9 @@ static struct omap_clk omap2420_clks[] = {
CLK(NULL,   "gfx_ick",  &gfx_ick,   CK_242X),
/* DSS domain clocks */
CLK("omap_dss", "ick",  &dss_ick,   CK_242X),
-   CLK("omap_dss", "dss1_fck", &dss1_fck,  CK_242X),
-   CLK("omap_dss", "dss2_fck", &dss2_fck,  CK_242X),
-   CLK("omap_dss", "tv_fck",   &dss_54m_fck,   CK_242X),
+   CLK("omap_dss", "fck",  &dss1_fck,  CK_242X),
+   CLK("omap_dss", "sys_clk",  &dss2_fck,  CK_242X),
+   CLK("omap_dss", "tv_clk",   &dss_54m_fck,   CK_242X),
/* L3 domain clocks */
CLK(NULL,   "core_l3_ck",   &core_l3_ck,CK_242X),
CLK(NULL,   "ssi_fck",  &ssi_ssr_sst_fck, CK_242X),
diff --git a/arch/arm/mach-omap2/clock2430_data.c 
b/arch/arm/mach-omap2/clock2430_data.c
index 663f298..136171c 100644
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -1891,9 +1891,9 @@ static struct omap_clk omap2430_clks[] = {
CLK(NULL,   "mdm_osc_ck",   &mdm_osc_ck,CK_243X),
/* DSS domain clocks */
CLK("omap_dss", "ick",  &dss_ick,   CK_243X),
-   CLK("omap_dss", "dss1_fck", &dss1_fck,  CK_243X),
-   CLK("omap_dss", "dss2_fck", &dss2_fck,  CK_243X),
-   CLK("omap_dss", "tv_fck",   &dss_54m_fck,   CK_243X),
+   CLK("omap_dss", "fck",  &dss1_fck,  CK_243X),
+   CLK("omap_dss", "sys_clk",  &dss2_fck,  CK_243X),
+   CLK("omap_dss", "tv_clk",   &dss_54m_fck,   CK_243X),
/* L3 domain clocks */
CLK(NULL,   "core_l3_ck",   &core_l3_ck,CK_243X),
CLK(NULL,   "ssi_fck",  &ssi_ssr_sst_fck, CK_243X),
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c 
b/arch/arm/mach-omap2/clock3xxx_data.c
index 5c97b93..414de70 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3357,11 +3357,11 @@ static struct omap_clk omap3xxx_clks[] = {
CLK("omap_rng", "ick",  &rng_ick,   CK_34XX | CK_36XX),
CLK(NULL,   "sha11_ick",&sha11_ick, CK_34XX | CK_36XX),
CLK(NULL,   "des1_ick", &des1_ick,  CK_34XX | CK_36XX),
-   CLK("omap_dss", "dss1_fck", &dss1_alwon_fck_3430es1, CK_3430ES1),
-   CLK("omap_dss", "dss1_fck", &dss1_alwon_fck_3430es2, CK_3430ES2PLUS 
| CK_AM35XX | CK_36XX),
-   CLK("omap_dss", "tv_fck",   &dss_tv_fck,CK_3XXX),
-   CLK("omap_dss", "video_fck",&dss_96m_fck,   CK_3XXX),
-   CLK("omap_dss", "dss2_fck", &dss2_alwon_fck, CK_3XXX),
+   CLK("omap_dss", "fck",  &dss1_alwon_fck_3430es1, CK_3430ES1),
+   CLK("omap_dss", "fck",  &dss1_alwon_fck_3430es2, CK_3430ES2PLUS 
| CK_AM35XX | CK_36XX),
+   CLK("omap_dss", "tv_clk",   &dss_tv_fck,CK_3XXX),
+   CLK("omap_dss", "video_clk",&dss_96m_fck,   CK_3XXX),
+   CLK("omap_dss", "sys_clk",  &dss2_alwon_fck, CK_3XXX),
CLK("omap_dss", "ick",  &dss_ick_3430es1,   CK_3430ES1),
CLK("omap_dss", "ick",  &dss_ick_3430es2,   CK_3430ES2PLUS 
| CK_AM35XX | CK_36XX),
CLK(NULL,   "cam_mclk", &cam_mclk,  CK_34XX | CK_36XX),
diff --git a/arch/arm/mach-omap2/clock44xx_data.c 
b/arch/arm/mach-omap2/clock44xx_data.c
index e8cb32f..9bd3ae5 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3107,11 +3107,11 @@ static struct omap_clk omap44xx_clks[] = {
CLK(NULL,   "dmic_sync_mux_ck", &dmic_sync_mux_ck,  
CK_443X),
CLK(NULL,   "dmic_fck", &dmic_fck,  
CK_443X),
CLK(NULL,   "dsp_fck",  &dsp_fck,   
CK_443X),
-   CLK(NULL,   "dss_sys_clk",  &dss_sys_clk,   
CK_443X),
-   CLK(NULL,   "dss_tv_clk",