From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 9 Jun 2010 10:15:10 +0000 (+0100)
Subject: Merge branch 'ep93xx' into for-2.6.36
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/lisovros/linux_canprio.git/commitdiff_plain/6e03a61544c368c2c3ff946c1ce7807e5c36a527

Merge branch 'ep93xx' into for-2.6.36

Trivial add/add fixup required in the clock table.

Conflicts:
	arch/arm/mach-ep93xx/clock.c
---

6e03a61544c368c2c3ff946c1ce7807e5c36a527
diff --cc arch/arm/mach-ep93xx/clock.c
index e29bdef9b2e,e782af18ffb..803162492c4
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@@ -190,7 -210,9 +214,10 @@@ static struct clk_lookup clocks[] = 
  	INIT_CK("ep93xx-ohci",		NULL,		&clk_usb_host),
  	INIT_CK("ep93xx-keypad",	NULL,		&clk_keypad),
  	INIT_CK("ep93xx-fb",		NULL,		&clk_video),
 +	INIT_CK("ep93xx-spi.0",		NULL,		&clk_spi),
+ 	INIT_CK("ep93xx-i2s",		"mclk",		&clk_i2s_mclk),
+ 	INIT_CK("ep93xx-i2s",		"sclk",		&clk_i2s_sclk),
+ 	INIT_CK("ep93xx-i2s",		"lrclk",	&clk_i2s_lrclk),
  	INIT_CK(NULL,			"pwm_clk",	&clk_pwm),
  	INIT_CK(NULL,			"m2p0",		&clk_m2p0),
  	INIT_CK(NULL,			"m2p1",		&clk_m2p1),