Skip to contentSkip to conversation

ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention

PATCH New Vaibhav Hiremath 2 participants 5 messages Jul 16, 2012 – Aug 27, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support
lore
Share & tools
lore

Vaibhav Hiremath

author
#0 lore raw

PATCH 1/1 ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention

With commit ae6df418a21f3a361c5f9b878e32a8aba4e17692
Sub: ARM: OMAP2+: dmtimer: cleanup fclk usage)
The Timer functional clock naming convention has changed from gptX_fck => timerXfck, and so as the timer init function in mach-omap2/timer.c.
OMAP4 clocktree also has changed accordingly.

AM33xx Clock Tree has been merged during rc3-4 timeframe, before above commit got merged, so similar change is required for AM33xx as well (Change the gptX_fck => timerX_fck).

Signed-off-by Vaibhav Hiremath <[email protected]>
---
 arch/arm/mach-omap2/clock33xx_data.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/clock33xx_data.c +7 -7
index 25bbcc7..ae27de8 100644
@@ -1036,13 +1036,13 @@ static struct omap_clk am33xx_clks[] = {
 	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,	"gpt1_fck",		&timer1_fck,	CK_AM33XX),
-	CLK(NULL,	"gpt2_fck",		&timer2_fck,	CK_AM33XX),
-	CLK(NULL,	"gpt3_fck",		&timer3_fck,	CK_AM33XX),
-	CLK(NULL,	"gpt4_fck",		&timer4_fck,	CK_AM33XX),
-	CLK(NULL,	"gpt5_fck",		&timer5_fck,	CK_AM33XX),
-	CLK(NULL,	"gpt6_fck",		&timer6_fck,	CK_AM33XX),
-	CLK(NULL,	"gpt7_fck",		&timer7_fck,	CK_AM33XX),
+	CLK(NULL,	"timer1_fck",		&timer1_fck,	CK_AM33XX),
+	CLK(NULL,	"timer2_fck",		&timer2_fck,	CK_AM33XX),
+	CLK(NULL,	"timer3_fck",		&timer3_fck,	CK_AM33XX),
+	CLK(NULL,	"timer4_fck",		&timer4_fck,	CK_AM33XX),
+	CLK(NULL,	"timer5_fck",		&timer5_fck,	CK_AM33XX),
+	CLK(NULL,	"timer6_fck",		&timer6_fck,	CK_AM33XX),
+	CLK(NULL,	"timer7_fck",		&timer7_fck,	CK_AM33XX),
 	CLK(NULL,	"usbotg_fck",		&usbotg_fck,	CK_AM33XX),
 	CLK(NULL,	"ieee5000_fck",		&ieee5000_fck,	CK_AM33XX),
 	CLK(NULL,	"wdt1_fck",		&wdt1_fck,	CK_AM33XX),
Signature · 1 line
1.7.0.4
maintainer
#1 lore raw

PATCH 1/1 ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention

Quoted 7 lines · Vaibhav Hiremath

With commit ae6df418a21f3a361c5f9b878e32a8aba4e17692
Sub: ARM: OMAP2+: dmtimer: cleanup fclk usage)
The Timer functional clock naming convention has changed from gptX_fck => timerXfck, and so as the timer init function in mach-omap2/timer.c.
OMAP4 clocktree also has changed accordingly.

Quoted 5 lines

AM33xx Clock Tree has been merged during rc3-4 timeframe, before above commit got merged, so similar change is required for AM33xx as well (Change the gptX_fck => timerX_fck).

Signed-off-by Vaibhav Hiremath <[email protected]>

Thanks, this looks like 3.6-rc material, right?

- Paul

author
#2 lore raw

PATCH 1/1 ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention

Quoted 9 lines · Paul Walmsley
Quoted 7 lines · Vaibhav Hiremath

With commit ae6df418a21f3a361c5f9b878e32a8aba4e17692
Sub: ARM: OMAP2+: dmtimer: cleanup fclk usage)
The Timer functional clock naming convention has changed from gptX_fck => timerXfck, and so as the timer init function in mach-omap2/timer.c.
OMAP4 clocktree also has changed accordingly.

Quoted 9 lines
Quoted 5 lines

AM33xx Clock Tree has been merged during rc3-4 timeframe, before above commit got merged, so similar change is required for AM33xx as well (Change the gptX_fck => timerX_fck).

Signed-off-by Vaibhav Hiremath <[email protected]>

Thanks, this looks like 3.6-rc material, right?

Yes, that's correct.

Thanks,
Vaibhav

author
#3 lore raw

PATCH 1/1 ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention

Quoted 14 lines · Vaibhav
Quoted 13 lines · Paul Walmsley
Quoted 11 lines · Vaibhav Hiremath

With commit ae6df418a21f3a361c5f9b878e32a8aba4e17692
Sub: ARM: OMAP2+: dmtimer: cleanup fclk usage)
The Timer functional clock naming convention has changed from gptX_fck => timerXfck, and so as the timer init function in mach-omap2/timer.c.
OMAP4 clocktree also has changed accordingly.

AM33xx Clock Tree has been merged during rc3-4 timeframe, before above commit got merged, so similar change is required for AM33xx as well (Change the gptX_fck => timerX_fck).

Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Vaibhav Hiremath <[email protected]>

Thanks, this looks like 3.6-rc material, right?

Yes, that's correct.

Tony/Paul,

Ping !!!

Thanks,
Vaibhav

Quoted 8 lines

Thanks,
Vaibhav

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

maintainer
#4 lore raw

PATCH 1/1 ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention

In reply to Vaibhav Hiremath
Quoted 7 lines · Vaibhav Hiremath

With commit ae6df418a21f3a361c5f9b878e32a8aba4e17692
Sub: ARM: OMAP2+: dmtimer: cleanup fclk usage)
The Timer functional clock naming convention has changed from gptX_fck => timerXfck, and so as the timer init function in mach-omap2/timer.c.
OMAP4 clocktree also has changed accordingly.

Quoted 5 lines

AM33xx Clock Tree has been merged during rc3-4 timeframe, before above commit got merged, so similar change is required for AM33xx as well (Change the gptX_fck => timerX_fck).

Signed-off-by Vaibhav Hiremath <[email protected]>

Thanks, queued for v3.6-rc.

- Paul