author | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
Wed, 9 Jun 2010 10:15:10 +0000 (11:15 +0100) | ||
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
Wed, 9 Jun 2010 10:15:10 +0000 (11:15 +0100) |
Trivial add/add fixup required in the clock table.
Conflicts:
arch/arm/mach-ep93xx/clock.c
Conflicts:
arch/arm/mach-ep93xx/clock.c
diff --cc arch/arm/mach-ep93xx/clock.c
index e29bdef9b2e201ea345c4139487e4895dffad94d,e782af18ffb70f6c133b16b6b22d60addc9f577e..803162492c4a2c923e6d2b5b2f6216985e18b324
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),
diff --cc arch/arm/mach-ep93xx/core.c
Simple merge
Simple merge
Simple merge