Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57765013 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Paul Walmsley
Browse files

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



With commit ae6df418
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: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 4cbe5a55

arch/arm/mach-omap2/clock33xx_data.c

+7 −7
Original line number Diff line number Diff line
@@ -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),