From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Sumit Semwal <sumit.semwal@ti.com>
Cc: tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@ti.com,
hvaibhav@ti.com, linux-omap@vger.kernel.org, b-cousson@ti.com
Subject: Re: [v3,1/4] OMAP2PLUS: clocks: Align DSS clock names and roles
Date: Fri, 11 Feb 2011 14:46:50 +0200 [thread overview]
Message-ID: <1297428410.9552.319.camel@deskari> (raw)
In-Reply-To: <1296491266-6949-2-git-send-email-sumit.semwal@ti.com>
Hi,
This patch set looks good, no comments from me. I'll take this to my
tree.
Tomi
On Mon, 2011-01-31 at 16:27 +0000, Sumit Semwal wrote:
> 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>
>
> ---
> 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", &dss_tv_clk, CK_443X),
> - CLK(NULL, "dss_dss_clk", &dss_dss_clk, CK_443X),
> - CLK(NULL, "dss_48mhz_clk", &dss_48mhz_clk, CK_443X),
> - CLK(NULL, "dss_fck", &dss_fck, CK_443X),
> + CLK("omap_dss", "sys_clk", &dss_sys_clk, CK_443X),
> + CLK("omap_dss", "tv_clk", &dss_tv_clk, CK_443X),
> + CLK("omap_dss", "dss_clk", &dss_dss_clk, CK_443X),
> + CLK("omap_dss", "video_clk", &dss_48mhz_clk, CK_443X),
> + CLK("omap_dss", "fck", &dss_fck, CK_443X),
> CLK(NULL, "efuse_ctrl_cust_fck", &efuse_ctrl_cust_fck, CK_443X),
> CLK(NULL, "emif1_fck", &emif1_fck, CK_443X),
> CLK(NULL, "emif2_fck", &emif2_fck, CK_443X),
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index 713165d..cb0c624 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -770,7 +770,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dss_slaves[] = {
>
> static struct omap_hwmod_opt_clk dss_opt_clks[] = {
> { .role = "tv_clk", .clk = "dss_tv_fck" },
> - { .role = "dssclk", .clk = "dss_96m_fck" },
> + { .role = "video_clk", .clk = "dss_96m_fck" },
> { .role = "sys_clk", .clk = "dss2_alwon_fck" },
> };
>
> diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
> index f9390b4..91f8cf7 100644
> --- a/drivers/video/omap2/dss/dss.c
> +++ b/drivers/video/omap2/dss/dss.c
> @@ -758,19 +758,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;
>
next prev parent reply other threads:[~2011-02-11 12:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 16:27 [PATCH v3 0/4] OMAP2PLUS: DSS: Generalize clock names Sumit Semwal
2011-01-31 16:27 ` [PATCH v3 1/4] OMAP2PLUS: clocks: Align DSS clock names and roles Sumit Semwal
2011-02-10 6:22 ` Paul Walmsley
2011-02-11 12:46 ` Tomi Valkeinen [this message]
2011-01-31 16:27 ` [PATCH v3 2/4] OMAP2PLUS: DSS2: Generalize naming of PRCM related clock enums in DSS driver Sumit Semwal
2011-01-31 16:27 ` [PATCH v3 3/4] OMAP2PLUS: DSS2: Generalize external clock names in struct dss of dss.c Sumit Semwal
2011-01-31 16:27 ` [PATCH v3 4/4] OMAP4: DSS2: clocks: Add ick as dummy clock Sumit Semwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297428410.9552.319.camel@deskari \
--to=tomi.valkeinen@ti.com \
--cc=b-cousson@ti.com \
--cc=hvaibhav@ti.com \
--cc=khilman@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=sumit.semwal@ti.com \
--cc=tomi.valkeinen@nokia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox