* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup
@ 2011-10-04 21:20 Benoit Cousson
2011-10-04 21:20 ` [PATCH 1/2] ARM: OMAP2+: clock data: Remove redundant timer clkdev Benoit Cousson
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Benoit Cousson @ 2011-10-04 21:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony,
Here is the series to fix the warning and remove the redundant
latency structure that be removed since the timer runtime PM
adaptation was just pulled.
I was just able to test that on OMAP4.
Patches are based on Kevin's for_3.2/omap_device-2 branch
and are available here:
git://gitorious.org/omap-pm/linux.git for_3.2/timer_fixes
Regards,
Benoit
Benoit Cousson (2):
ARM: OMAP2+: clock data: Remove redundant timer clkdev
ARM: OMAP2+: timer: Remove omap_device_pm_latency
arch/arm/mach-omap2/clock2420_data.c | 12 ------------
arch/arm/mach-omap2/clock2430_data.c | 12 ------------
arch/arm/mach-omap2/clock3xxx_data.c | 12 ------------
arch/arm/mach-omap2/clock44xx_data.c | 11 -----------
arch/arm/mach-omap2/timer.c | 12 +-----------
5 files changed, 1 insertions(+), 58 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] ARM: OMAP2+: clock data: Remove redundant timer clkdev 2011-10-04 21:20 [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Benoit Cousson @ 2011-10-04 21:20 ` Benoit Cousson 2011-10-04 21:20 ` [PATCH 2/2] ARM: OMAP2+: timer: Remove omap_device_pm_latency Benoit Cousson ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Benoit Cousson @ 2011-10-04 21:20 UTC (permalink / raw) To: linux-arm-kernel The commit 318c3e15cd55c73a26ae22a65a8183655b3003f9 added some "fck" clock alias to timer devices that are not needed anymore since hwmod framework will create them automatically. A warning was added to highlight and thus fix the redundancy. [ 0.616424] omap_timer.1: alias fck already exists [ 0.621948] omap_timer.2: alias fck already exists [ 0.627380] omap_timer.3: alias fck already exists [ 0.632781] omap_timer.4: alias fck already exists [ 0.638214] omap_timer.5: alias fck already exists [ 0.643615] omap_timer.6: alias fck already exists [ 0.649078] omap_timer.7: alias fck already exists [ 0.654479] omap_timer.8: alias fck already exists [ 0.659881] omap_timer.9: alias fck already exists [ 0.665283] omap_timer.10: alias fck already exists [ 0.670776] omap_timer.11: alias fck already exists Remove all the clkdev entries for timer fck alias. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com> Cc: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/clock2420_data.c | 12 ------------ arch/arm/mach-omap2/clock2430_data.c | 12 ------------ arch/arm/mach-omap2/clock3xxx_data.c | 12 ------------ arch/arm/mach-omap2/clock44xx_data.c | 11 ----------- 4 files changed, 0 insertions(+), 47 deletions(-) diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index 14a6277..61ad385 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c @@ -1898,18 +1898,6 @@ static struct omap_clk omap2420_clks[] = { CLK(NULL, "pka_ick", &pka_ick, CK_242X), CLK(NULL, "usb_fck", &usb_fck, CK_242X), CLK("musb-hdrc", "fck", &osc_ck, CK_242X), - CLK("omap_timer.1", "fck", &gpt1_fck, CK_242X), - CLK("omap_timer.2", "fck", &gpt2_fck, CK_242X), - CLK("omap_timer.3", "fck", &gpt3_fck, CK_242X), - CLK("omap_timer.4", "fck", &gpt4_fck, CK_242X), - CLK("omap_timer.5", "fck", &gpt5_fck, CK_242X), - CLK("omap_timer.6", "fck", &gpt6_fck, CK_242X), - CLK("omap_timer.7", "fck", &gpt7_fck, CK_242X), - CLK("omap_timer.8", "fck", &gpt8_fck, CK_242X), - CLK("omap_timer.9", "fck", &gpt9_fck, CK_242X), - CLK("omap_timer.10", "fck", &gpt10_fck, CK_242X), - CLK("omap_timer.11", "fck", &gpt11_fck, CK_242X), - CLK("omap_timer.12", "fck", &gpt12_fck, CK_242X), CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X), CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X), CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X), diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index ea6717c..0cc1287 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c @@ -1998,18 +1998,6 @@ static struct omap_clk omap2430_clks[] = { CLK(NULL, "mdm_intc_ick", &mdm_intc_ick, CK_243X), CLK("omap_hsmmc.0", "mmchsdb_fck", &mmchsdb1_fck, CK_243X), CLK("omap_hsmmc.1", "mmchsdb_fck", &mmchsdb2_fck, CK_243X), - CLK("omap_timer.1", "fck", &gpt1_fck, CK_243X), - CLK("omap_timer.2", "fck", &gpt2_fck, CK_243X), - CLK("omap_timer.3", "fck", &gpt3_fck, CK_243X), - CLK("omap_timer.4", "fck", &gpt4_fck, CK_243X), - CLK("omap_timer.5", "fck", &gpt5_fck, CK_243X), - CLK("omap_timer.6", "fck", &gpt6_fck, CK_243X), - CLK("omap_timer.7", "fck", &gpt7_fck, CK_243X), - CLK("omap_timer.8", "fck", &gpt8_fck, CK_243X), - CLK("omap_timer.9", "fck", &gpt9_fck, CK_243X), - CLK("omap_timer.10", "fck", &gpt10_fck, CK_243X), - CLK("omap_timer.11", "fck", &gpt11_fck, CK_243X), - CLK("omap_timer.12", "fck", &gpt12_fck, CK_243X), CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X), CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X), CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X), diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index 65dd363..5d0064a 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c @@ -3464,18 +3464,6 @@ static struct omap_clk omap3xxx_clks[] = { CLK("musb-am35x", "fck", &hsotgusb_fck_am35xx, CK_AM35XX), CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX), CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX), - CLK("omap_timer.1", "fck", &gpt1_fck, CK_3XXX), - CLK("omap_timer.2", "fck", &gpt2_fck, CK_3XXX), - CLK("omap_timer.3", "fck", &gpt3_fck, CK_3XXX), - CLK("omap_timer.4", "fck", &gpt4_fck, CK_3XXX), - CLK("omap_timer.5", "fck", &gpt5_fck, CK_3XXX), - CLK("omap_timer.6", "fck", &gpt6_fck, CK_3XXX), - CLK("omap_timer.7", "fck", &gpt7_fck, CK_3XXX), - CLK("omap_timer.8", "fck", &gpt8_fck, CK_3XXX), - CLK("omap_timer.9", "fck", &gpt9_fck, CK_3XXX), - CLK("omap_timer.10", "fck", &gpt10_fck, CK_3XXX), - CLK("omap_timer.11", "fck", &gpt11_fck, CK_3XXX), - CLK("omap_timer.12", "fck", &gpt12_fck, CK_3XXX), CLK("omap_timer.1", "32k_ck", &omap_32k_fck, CK_3XXX), CLK("omap_timer.2", "32k_ck", &omap_32k_fck, CK_3XXX), CLK("omap_timer.3", "32k_ck", &omap_32k_fck, CK_3XXX), diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 946bf04..f9c6425 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -3363,17 +3363,6 @@ static struct omap_clk omap44xx_clks[] = { CLK("usbhs-omap.0", "usbhost_ick", &dummy_ck, CK_443X), CLK("usbhs-omap.0", "usbtll_fck", &dummy_ck, CK_443X), CLK("omap_wdt", "ick", &dummy_ck, CK_443X), - CLK("omap_timer.1", "fck", &timer1_fck, CK_443X), - CLK("omap_timer.2", "fck", &timer2_fck, CK_443X), - CLK("omap_timer.3", "fck", &timer3_fck, CK_443X), - CLK("omap_timer.4", "fck", &timer4_fck, CK_443X), - CLK("omap_timer.5", "fck", &timer5_fck, CK_443X), - CLK("omap_timer.6", "fck", &timer6_fck, CK_443X), - CLK("omap_timer.7", "fck", &timer7_fck, CK_443X), - CLK("omap_timer.8", "fck", &timer8_fck, CK_443X), - CLK("omap_timer.9", "fck", &timer9_fck, CK_443X), - CLK("omap_timer.10", "fck", &timer10_fck, CK_443X), - CLK("omap_timer.11", "fck", &timer11_fck, CK_443X), CLK("omap_timer.1", "32k_ck", &sys_32k_ck, CK_443X), CLK("omap_timer.2", "32k_ck", &sys_32k_ck, CK_443X), CLK("omap_timer.3", "32k_ck", &sys_32k_ck, CK_443X), -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: OMAP2+: timer: Remove omap_device_pm_latency 2011-10-04 21:20 [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Benoit Cousson 2011-10-04 21:20 ` [PATCH 1/2] ARM: OMAP2+: clock data: Remove redundant timer clkdev Benoit Cousson @ 2011-10-04 21:20 ` Benoit Cousson 2011-10-04 21:36 ` [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Cousson, Benoit 2011-10-06 20:12 ` Tony Lindgren 3 siblings, 0 replies; 8+ messages in thread From: Benoit Cousson @ 2011-10-04 21:20 UTC (permalink / raw) To: linux-arm-kernel Remove the structure since a default one is now available. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Kevin Hilman <khilman@ti.com> --- arch/arm/mach-omap2/timer.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index e49fc7b..037b0d7 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -408,14 +408,6 @@ static int omap2_dm_timer_set_src(struct platform_device *pdev, int source) return ret; } -struct omap_device_pm_latency omap2_dmtimer_latency[] = { - { - .deactivate_func = omap_device_idle_hwmods, - .activate_func = omap_device_enable_hwmods, - .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, - }, -}; - /** * omap_timer_init - build and register timer device with an * associated timer hwmod @@ -477,9 +469,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused) pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; #endif pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata), - omap2_dmtimer_latency, - ARRAY_SIZE(omap2_dmtimer_latency), - 0); + NULL, 0, 0); if (IS_ERR(pdev)) { pr_err("%s: Can't build omap_device for %s: %s.\n", -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup 2011-10-04 21:20 [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Benoit Cousson 2011-10-04 21:20 ` [PATCH 1/2] ARM: OMAP2+: clock data: Remove redundant timer clkdev Benoit Cousson 2011-10-04 21:20 ` [PATCH 2/2] ARM: OMAP2+: timer: Remove omap_device_pm_latency Benoit Cousson @ 2011-10-04 21:36 ` Cousson, Benoit 2011-10-10 5:40 ` DebBarma, Tarun Kanti 2011-10-06 20:12 ` Tony Lindgren 3 siblings, 1 reply; 8+ messages in thread From: Cousson, Benoit @ 2011-10-04 21:36 UTC (permalink / raw) To: linux-arm-kernel Hi Tarun, On 10/4/2011 11:20 PM, Cousson, Benoit wrote: > Hi Tony, > > Here is the series to fix the warning and remove the redundant > latency structure that be removed since the timer runtime PM > adaptation was just pulled. > > I was just able to test that on OMAP4. It will be nice if you can test that on the other platforms. In theory, if they are properly using hwmod that should work fine. Thanks, Benoit > > Patches are based on Kevin's for_3.2/omap_device-2 branch > and are available here: > git://gitorious.org/omap-pm/linux.git for_3.2/timer_fixes > > Regards, > Benoit > > > Benoit Cousson (2): > ARM: OMAP2+: clock data: Remove redundant timer clkdev > ARM: OMAP2+: timer: Remove omap_device_pm_latency > > arch/arm/mach-omap2/clock2420_data.c | 12 ------------ > arch/arm/mach-omap2/clock2430_data.c | 12 ------------ > arch/arm/mach-omap2/clock3xxx_data.c | 12 ------------ > arch/arm/mach-omap2/clock44xx_data.c | 11 ----------- > arch/arm/mach-omap2/timer.c | 12 +----------- > 5 files changed, 1 insertions(+), 58 deletions(-) > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup 2011-10-04 21:36 ` [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Cousson, Benoit @ 2011-10-10 5:40 ` DebBarma, Tarun Kanti 2011-10-10 10:05 ` DebBarma, Tarun Kanti 0 siblings, 1 reply; 8+ messages in thread From: DebBarma, Tarun Kanti @ 2011-10-10 5:40 UTC (permalink / raw) To: linux-arm-kernel On Wed, Oct 5, 2011 at 3:06 AM, Cousson, Benoit <b-cousson@ti.com> wrote: > Hi Tarun, > > On 10/4/2011 11:20 PM, Cousson, Benoit wrote: >> >> Hi Tony, >> >> Here is the series to fix the warning and remove the redundant >> latency structure that be removed since the timer runtime PM >> adaptation was just pulled. >> >> I was just able to test that on OMAP4. > > It will be nice if you can test that on the other platforms. > In theory, if they are properly using hwmod that should work fine. Yes, I will test in other platforms. -- Tarun > > Thanks, > Benoit > >> >> Patches are based on Kevin's for_3.2/omap_device-2 branch >> and are available here: >> git://gitorious.org/omap-pm/linux.git for_3.2/timer_fixes >> >> Regards, >> Benoit >> >> >> Benoit Cousson (2): >> ? ARM: OMAP2+: clock data: Remove redundant timer clkdev >> ? ARM: OMAP2+: timer: Remove omap_device_pm_latency >> >> ?arch/arm/mach-omap2/clock2420_data.c | ? 12 ------------ >> ?arch/arm/mach-omap2/clock2430_data.c | ? 12 ------------ >> ?arch/arm/mach-omap2/clock3xxx_data.c | ? 12 ------------ >> ?arch/arm/mach-omap2/clock44xx_data.c | ? 11 ----------- >> ?arch/arm/mach-omap2/timer.c ? ? ? ? ?| ? 12 +----------- >> ?5 files changed, 1 insertions(+), 58 deletions(-) >> > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup 2011-10-10 5:40 ` DebBarma, Tarun Kanti @ 2011-10-10 10:05 ` DebBarma, Tarun Kanti 2011-10-10 11:56 ` Cousson, Benoit 0 siblings, 1 reply; 8+ messages in thread From: DebBarma, Tarun Kanti @ 2011-10-10 10:05 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 10, 2011 at 11:10 AM, DebBarma, Tarun Kanti <tarun.kanti@ti.com> wrote: > On Wed, Oct 5, 2011 at 3:06 AM, Cousson, Benoit <b-cousson@ti.com> wrote: >> Hi Tarun, >> >> On 10/4/2011 11:20 PM, Cousson, Benoit wrote: >>> >>> Hi Tony, >>> >>> Here is the series to fix the warning and remove the redundant >>> latency structure that be removed since the timer runtime PM >>> adaptation was just pulled. >>> >>> I was just able to test that on OMAP4. >> >> It will be nice if you can test that on the other platforms. >> In theory, if they are properly using hwmod that should work fine. > Yes, I will test in other platforms. I have tested on OMAP2420, OMAP2430 and OMAP3430. -- Tarun >> Thanks, >> Benoit >> >>> >>> Patches are based on Kevin's for_3.2/omap_device-2 branch >>> and are available here: >>> git://gitorious.org/omap-pm/linux.git for_3.2/timer_fixes >>> >>> Regards, >>> Benoit >>> >>> >>> Benoit Cousson (2): >>> ? ARM: OMAP2+: clock data: Remove redundant timer clkdev >>> ? ARM: OMAP2+: timer: Remove omap_device_pm_latency >>> >>> ?arch/arm/mach-omap2/clock2420_data.c | ? 12 ------------ >>> ?arch/arm/mach-omap2/clock2430_data.c | ? 12 ------------ >>> ?arch/arm/mach-omap2/clock3xxx_data.c | ? 12 ------------ >>> ?arch/arm/mach-omap2/clock44xx_data.c | ? 11 ----------- >>> ?arch/arm/mach-omap2/timer.c ? ? ? ? ?| ? 12 +----------- >>> ?5 files changed, 1 insertions(+), 58 deletions(-) >>> >> >> > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup 2011-10-10 10:05 ` DebBarma, Tarun Kanti @ 2011-10-10 11:56 ` Cousson, Benoit 0 siblings, 0 replies; 8+ messages in thread From: Cousson, Benoit @ 2011-10-10 11:56 UTC (permalink / raw) To: linux-arm-kernel On 10/10/2011 12:05 PM, DebBarma, Tarun Kanti wrote: > On Mon, Oct 10, 2011 at 11:10 AM, DebBarma, Tarun Kanti > <tarun.kanti@ti.com> wrote: >> On Wed, Oct 5, 2011 at 3:06 AM, Cousson, Benoit<b-cousson@ti.com> wrote: >>> Hi Tarun, >>> >>> On 10/4/2011 11:20 PM, Cousson, Benoit wrote: >>>> >>>> Hi Tony, >>>> >>>> Here is the series to fix the warning and remove the redundant >>>> latency structure that be removed since the timer runtime PM >>>> adaptation was just pulled. >>>> >>>> I was just able to test that on OMAP4. >>> >>> It will be nice if you can test that on the other platforms. >>> In theory, if they are properly using hwmod that should work fine. >> Yes, I will test in other platforms. > I have tested on OMAP2420, OMAP2430 and OMAP3430. Thanks Tarun, Regards, Benoit ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup 2011-10-04 21:20 [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Benoit Cousson ` (2 preceding siblings ...) 2011-10-04 21:36 ` [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Cousson, Benoit @ 2011-10-06 20:12 ` Tony Lindgren 3 siblings, 0 replies; 8+ messages in thread From: Tony Lindgren @ 2011-10-06 20:12 UTC (permalink / raw) To: linux-arm-kernel * Benoit Cousson <b-cousson@ti.com> [111004 13:46]: > Hi Tony, > > Here is the series to fix the warning and remove the redundant > latency structure that be removed since the timer runtime PM > adaptation was just pulled. > > I was just able to test that on OMAP4. > > Patches are based on Kevin's for_3.2/omap_device-2 branch > and are available here: > git://gitorious.org/omap-pm/linux.git for_3.2/timer_fixes Thanks, applying both into fixes-part2 branch. Regards, Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-10-10 11:56 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-10-04 21:20 [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Benoit Cousson 2011-10-04 21:20 ` [PATCH 1/2] ARM: OMAP2+: clock data: Remove redundant timer clkdev Benoit Cousson 2011-10-04 21:20 ` [PATCH 2/2] ARM: OMAP2+: timer: Remove omap_device_pm_latency Benoit Cousson 2011-10-04 21:36 ` [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup Cousson, Benoit 2011-10-10 5:40 ` DebBarma, Tarun Kanti 2011-10-10 10:05 ` DebBarma, Tarun Kanti 2011-10-10 11:56 ` Cousson, Benoit 2011-10-06 20:12 ` Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).