From: Kevin Hilman <khilman@deeprootsystems.com>
To: Jean Pihet <jean.pihet@newoldbits.com>
Cc: linux-omap@vger.kernel.org, paul@pwsan.com,
linux-arm-kernel@lists.infradead.org, Jean Pihet <j-pihet@ti.com>
Subject: Re: [PATCH] ARM: OMAP: hwmod: align the SmartReflex fck names
Date: Tue, 02 Oct 2012 14:49:31 -0700 [thread overview]
Message-ID: <87626s8rys.fsf@deeprootsystems.com> (raw)
In-Reply-To: <1348497352-6464-1-git-send-email-j-pihet@ti.com> (Jean Pihet's message of "Mon, 24 Sep 2012 16:35:52 +0200")
Jean Pihet <jean.pihet@newoldbits.com> writes:
> Rename the smartreflex fck names for consistency and better readability;
> rename the clock aliases for use by the SmartReflex driver, with the
> "smartreflex.%d" format.
hmm, do we even need the clkdev nodes anymore? The driver isn't
directly accessing the fclk at all, so it seems like these could be
removed now.
Kevin
> Signed-off-by: Jean Pihet <j-pihet@ti.com>
> ---
> arch/arm/mach-omap2/clock33xx_data.c | 12 ++++++------
> arch/arm/mach-omap2/clock3xxx_data.c | 12 ++++++------
> arch/arm/mach-omap2/clock44xx_data.c | 6 +++---
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 ++++----
> 4 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c
> index 25bbcc7..a328f12 100644
> --- a/arch/arm/mach-omap2/clock33xx_data.c
> +++ b/arch/arm/mach-omap2/clock33xx_data.c
> @@ -548,16 +548,16 @@ static struct clk mcasp1_fck = {
> .recalc = &followparent_recalc,
> };
>
> -static struct clk smartreflex0_fck = {
> - .name = "smartreflex0_fck",
> +static struct clk smartreflex_mpu_fck = {
> + .name = "smartreflex_mpu_fck",
> .clkdm_name = "l4_wkup_clkdm",
> .parent = &sys_clkin_ck,
> .ops = &clkops_null,
> .recalc = &followparent_recalc,
> };
>
> -static struct clk smartreflex1_fck = {
> - .name = "smartreflex1_fck",
> +static struct clk smartreflex_core_fck = {
> + .name = "smartreflex_core_fck",
> .clkdm_name = "l4_wkup_clkdm",
> .parent = &sys_clkin_ck,
> .ops = &clkops_null,
> @@ -1034,8 +1034,8 @@ static struct omap_clk am33xx_clks[] = {
> CLK("davinci-mcasp.1", NULL, &mcasp1_fck, CK_AM33XX),
> CLK("NULL", "mmc2_fck", &mmc2_fck, CK_AM33XX),
> CLK(NULL, "mmu_fck", &mmu_fck, CK_AM33XX),
> - CLK(NULL, "smartreflex0_fck", &smartreflex0_fck, CK_AM33XX),
> - CLK(NULL, "smartreflex1_fck", &smartreflex1_fck, CK_AM33XX),
> + CLK(NULL, "smartreflex.0", &smartreflex_mpu_fck, CK_AM33XX),
> + CLK(NULL, "smartreflex.1", &smartreflex_core_fck, CK_AM33XX),
> CLK(NULL, "gpt1_fck", &timer1_fck, CK_AM33XX),
> CLK(NULL, "gpt2_fck", &timer2_fck, CK_AM33XX),
> CLK(NULL, "gpt3_fck", &timer3_fck, CK_AM33XX),
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> index 83bed9a..a197cf2 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3050,8 +3050,8 @@ static struct clk traceclk_fck = {
> /* SR clocks */
>
> /* SmartReflex fclk (VDD1) */
> -static struct clk sr1_fck = {
> - .name = "sr1_fck",
> +static struct clk smartreflex_mpu_iva_fck = {
> + .name = "smartreflex_mpu_iva_fck",
> .ops = &clkops_omap2_dflt_wait,
> .parent = &sys_ck,
> .enable_reg = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
> @@ -3061,8 +3061,8 @@ static struct clk sr1_fck = {
> };
>
> /* SmartReflex fclk (VDD2) */
> -static struct clk sr2_fck = {
> - .name = "sr2_fck",
> +static struct clk smartreflex_core_fck = {
> + .name = "smartreflex_core_fck",
> .ops = &clkops_omap2_dflt_wait,
> .parent = &sys_ck,
> .enable_reg = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
> @@ -3447,8 +3447,8 @@ static struct omap_clk omap3xxx_clks[] = {
> CLK(NULL, "atclk_fck", &atclk_fck, CK_3XXX),
> CLK(NULL, "traceclk_src_fck", &traceclk_src_fck, CK_3XXX),
> CLK(NULL, "traceclk_fck", &traceclk_fck, CK_3XXX),
> - CLK(NULL, "sr1_fck", &sr1_fck, CK_34XX | CK_36XX),
> - CLK(NULL, "sr2_fck", &sr2_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "smartreflex.0", &smartreflex_mpu_iva_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "smartreflex.1", &smartreflex_core_fck, CK_34XX | CK_36XX),
> CLK(NULL, "sr_l4_ick", &sr_l4_ick, CK_34XX | CK_36XX),
> CLK(NULL, "secure_32k_fck", &secure_32k_fck, CK_3XXX),
> CLK(NULL, "gpt12_fck", &gpt12_fck, CK_3XXX),
> diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
> index d7f55e4..9cc1112 100644
> --- a/arch/arm/mach-omap2/clock44xx_data.c
> +++ b/arch/arm/mach-omap2/clock44xx_data.c
> @@ -3224,9 +3224,9 @@ static struct omap_clk omap44xx_clks[] = {
> CLK(NULL, "slimbus2_fclk_0", &slimbus2_fclk_0, CK_443X),
> CLK(NULL, "slimbus2_slimbus_clk", &slimbus2_slimbus_clk, CK_443X),
> CLK(NULL, "slimbus2_fck", &slimbus2_fck, CK_443X),
> - CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck, CK_443X),
> - CLK(NULL, "smartreflex_iva_fck", &smartreflex_iva_fck, CK_443X),
> - CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck, CK_443X),
> + CLK(NULL, "smartreflex.0", &smartreflex_core_fck, CK_443X),
> + CLK(NULL, "smartreflex.1", &smartreflex_iva_fck, CK_443X),
> + CLK(NULL, "smartreflex.2", &smartreflex_mpu_fck, CK_443X),
> CLK(NULL, "timer1_fck", &timer1_fck, CK_443X),
> CLK(NULL, "timer10_fck", &timer10_fck, CK_443X),
> CLK(NULL, "timer11_fck", &timer11_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 c9e3820..2b2b8fc 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -1359,7 +1359,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_mpu_irqs[] = {
> static struct omap_hwmod omap34xx_sr1_hwmod = {
> .name = "smartreflex_mpu_iva",
> .class = &omap34xx_smartreflex_hwmod_class,
> - .main_clk = "sr1_fck",
> + .main_clk = "smartreflex_mpu_iva_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
> @@ -1377,7 +1377,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {
> static struct omap_hwmod omap36xx_sr1_hwmod = {
> .name = "smartreflex_mpu_iva",
> .class = &omap36xx_smartreflex_hwmod_class,
> - .main_clk = "sr1_fck",
> + .main_clk = "smartreflex_mpu_iva_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
> @@ -1404,7 +1404,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_core_irqs[] = {
> static struct omap_hwmod omap34xx_sr2_hwmod = {
> .name = "smartreflex_core",
> .class = &omap34xx_smartreflex_hwmod_class,
> - .main_clk = "sr2_fck",
> + .main_clk = "smartreflex_core_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
> @@ -1422,7 +1422,7 @@ static struct omap_hwmod omap34xx_sr2_hwmod = {
> static struct omap_hwmod omap36xx_sr2_hwmod = {
> .name = "smartreflex_core",
> .class = &omap36xx_smartreflex_hwmod_class,
> - .main_clk = "sr2_fck",
> + .main_clk = "smartreflex_core_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
WARNING: multiple messages have this Message-ID (diff)
From: khilman@deeprootsystems.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP: hwmod: align the SmartReflex fck names
Date: Tue, 02 Oct 2012 14:49:31 -0700 [thread overview]
Message-ID: <87626s8rys.fsf@deeprootsystems.com> (raw)
In-Reply-To: <1348497352-6464-1-git-send-email-j-pihet@ti.com> (Jean Pihet's message of "Mon, 24 Sep 2012 16:35:52 +0200")
Jean Pihet <jean.pihet@newoldbits.com> writes:
> Rename the smartreflex fck names for consistency and better readability;
> rename the clock aliases for use by the SmartReflex driver, with the
> "smartreflex.%d" format.
hmm, do we even need the clkdev nodes anymore? The driver isn't
directly accessing the fclk at all, so it seems like these could be
removed now.
Kevin
> Signed-off-by: Jean Pihet <j-pihet@ti.com>
> ---
> arch/arm/mach-omap2/clock33xx_data.c | 12 ++++++------
> arch/arm/mach-omap2/clock3xxx_data.c | 12 ++++++------
> arch/arm/mach-omap2/clock44xx_data.c | 6 +++---
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 ++++----
> 4 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c
> index 25bbcc7..a328f12 100644
> --- a/arch/arm/mach-omap2/clock33xx_data.c
> +++ b/arch/arm/mach-omap2/clock33xx_data.c
> @@ -548,16 +548,16 @@ static struct clk mcasp1_fck = {
> .recalc = &followparent_recalc,
> };
>
> -static struct clk smartreflex0_fck = {
> - .name = "smartreflex0_fck",
> +static struct clk smartreflex_mpu_fck = {
> + .name = "smartreflex_mpu_fck",
> .clkdm_name = "l4_wkup_clkdm",
> .parent = &sys_clkin_ck,
> .ops = &clkops_null,
> .recalc = &followparent_recalc,
> };
>
> -static struct clk smartreflex1_fck = {
> - .name = "smartreflex1_fck",
> +static struct clk smartreflex_core_fck = {
> + .name = "smartreflex_core_fck",
> .clkdm_name = "l4_wkup_clkdm",
> .parent = &sys_clkin_ck,
> .ops = &clkops_null,
> @@ -1034,8 +1034,8 @@ static struct omap_clk am33xx_clks[] = {
> CLK("davinci-mcasp.1", NULL, &mcasp1_fck, CK_AM33XX),
> CLK("NULL", "mmc2_fck", &mmc2_fck, CK_AM33XX),
> CLK(NULL, "mmu_fck", &mmu_fck, CK_AM33XX),
> - CLK(NULL, "smartreflex0_fck", &smartreflex0_fck, CK_AM33XX),
> - CLK(NULL, "smartreflex1_fck", &smartreflex1_fck, CK_AM33XX),
> + CLK(NULL, "smartreflex.0", &smartreflex_mpu_fck, CK_AM33XX),
> + CLK(NULL, "smartreflex.1", &smartreflex_core_fck, CK_AM33XX),
> CLK(NULL, "gpt1_fck", &timer1_fck, CK_AM33XX),
> CLK(NULL, "gpt2_fck", &timer2_fck, CK_AM33XX),
> CLK(NULL, "gpt3_fck", &timer3_fck, CK_AM33XX),
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> index 83bed9a..a197cf2 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3050,8 +3050,8 @@ static struct clk traceclk_fck = {
> /* SR clocks */
>
> /* SmartReflex fclk (VDD1) */
> -static struct clk sr1_fck = {
> - .name = "sr1_fck",
> +static struct clk smartreflex_mpu_iva_fck = {
> + .name = "smartreflex_mpu_iva_fck",
> .ops = &clkops_omap2_dflt_wait,
> .parent = &sys_ck,
> .enable_reg = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
> @@ -3061,8 +3061,8 @@ static struct clk sr1_fck = {
> };
>
> /* SmartReflex fclk (VDD2) */
> -static struct clk sr2_fck = {
> - .name = "sr2_fck",
> +static struct clk smartreflex_core_fck = {
> + .name = "smartreflex_core_fck",
> .ops = &clkops_omap2_dflt_wait,
> .parent = &sys_ck,
> .enable_reg = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
> @@ -3447,8 +3447,8 @@ static struct omap_clk omap3xxx_clks[] = {
> CLK(NULL, "atclk_fck", &atclk_fck, CK_3XXX),
> CLK(NULL, "traceclk_src_fck", &traceclk_src_fck, CK_3XXX),
> CLK(NULL, "traceclk_fck", &traceclk_fck, CK_3XXX),
> - CLK(NULL, "sr1_fck", &sr1_fck, CK_34XX | CK_36XX),
> - CLK(NULL, "sr2_fck", &sr2_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "smartreflex.0", &smartreflex_mpu_iva_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "smartreflex.1", &smartreflex_core_fck, CK_34XX | CK_36XX),
> CLK(NULL, "sr_l4_ick", &sr_l4_ick, CK_34XX | CK_36XX),
> CLK(NULL, "secure_32k_fck", &secure_32k_fck, CK_3XXX),
> CLK(NULL, "gpt12_fck", &gpt12_fck, CK_3XXX),
> diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
> index d7f55e4..9cc1112 100644
> --- a/arch/arm/mach-omap2/clock44xx_data.c
> +++ b/arch/arm/mach-omap2/clock44xx_data.c
> @@ -3224,9 +3224,9 @@ static struct omap_clk omap44xx_clks[] = {
> CLK(NULL, "slimbus2_fclk_0", &slimbus2_fclk_0, CK_443X),
> CLK(NULL, "slimbus2_slimbus_clk", &slimbus2_slimbus_clk, CK_443X),
> CLK(NULL, "slimbus2_fck", &slimbus2_fck, CK_443X),
> - CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck, CK_443X),
> - CLK(NULL, "smartreflex_iva_fck", &smartreflex_iva_fck, CK_443X),
> - CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck, CK_443X),
> + CLK(NULL, "smartreflex.0", &smartreflex_core_fck, CK_443X),
> + CLK(NULL, "smartreflex.1", &smartreflex_iva_fck, CK_443X),
> + CLK(NULL, "smartreflex.2", &smartreflex_mpu_fck, CK_443X),
> CLK(NULL, "timer1_fck", &timer1_fck, CK_443X),
> CLK(NULL, "timer10_fck", &timer10_fck, CK_443X),
> CLK(NULL, "timer11_fck", &timer11_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 c9e3820..2b2b8fc 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -1359,7 +1359,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_mpu_irqs[] = {
> static struct omap_hwmod omap34xx_sr1_hwmod = {
> .name = "smartreflex_mpu_iva",
> .class = &omap34xx_smartreflex_hwmod_class,
> - .main_clk = "sr1_fck",
> + .main_clk = "smartreflex_mpu_iva_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
> @@ -1377,7 +1377,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {
> static struct omap_hwmod omap36xx_sr1_hwmod = {
> .name = "smartreflex_mpu_iva",
> .class = &omap36xx_smartreflex_hwmod_class,
> - .main_clk = "sr1_fck",
> + .main_clk = "smartreflex_mpu_iva_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
> @@ -1404,7 +1404,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_core_irqs[] = {
> static struct omap_hwmod omap34xx_sr2_hwmod = {
> .name = "smartreflex_core",
> .class = &omap34xx_smartreflex_hwmod_class,
> - .main_clk = "sr2_fck",
> + .main_clk = "smartreflex_core_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
> @@ -1422,7 +1422,7 @@ static struct omap_hwmod omap34xx_sr2_hwmod = {
> static struct omap_hwmod omap36xx_sr2_hwmod = {
> .name = "smartreflex_core",
> .class = &omap36xx_smartreflex_hwmod_class,
> - .main_clk = "sr2_fck",
> + .main_clk = "smartreflex_core_fck",
> .prcm = {
> .omap2 = {
> .prcm_reg_id = 1,
next prev parent reply other threads:[~2012-10-02 21:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 9:48 [PATCH] ARM: OMAP: hwmod: align the SmartReflex fck names Jean Pihet
2012-09-20 9:48 ` Jean Pihet
2012-09-24 14:34 ` Jean Pihet
2012-09-24 14:34 ` Jean Pihet
2012-09-24 14:35 ` Jean Pihet
2012-09-24 14:35 ` Jean Pihet
2012-10-02 21:49 ` Kevin Hilman [this message]
2012-10-02 21:49 ` Kevin Hilman
2012-10-02 22:08 ` Kevin Hilman
2012-10-02 22:08 ` Kevin Hilman
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=87626s8rys.fsf@deeprootsystems.com \
--to=khilman@deeprootsystems.com \
--cc=j-pihet@ti.com \
--cc=jean.pihet@newoldbits.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.