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

Commit 97b2073f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'davinci-fixes-for-linus-2' of... 

Merge branch 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  DA830: fix USB 2.0 clock entry
parents 508ff9d4 b9af5ddf

arch/arm/mach-davinci/da830.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static struct clk_lookup da830_clks[] = { 
	CLK("davinci-mcasp.0",	NULL,		&mcasp0_clk),

	CLK("davinci-mcasp.1",	NULL,		&mcasp1_clk),

	CLK("davinci-mcasp.2",	NULL,		&mcasp2_clk),

	CLK("musb_hdrc",	NULL,		&usb20_clk),

	CLK(NULL,		"usb20",	&usb20_clk),

	CLK(NULL,		"aemif",	&aemif_clk),

	CLK(NULL,		"aintc",	&aintc_clk),

	CLK(NULL,		"secu_mgr",	&secu_mgr_clk),