Arnd Bergmann 93c6d8927f
Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock ...
Shawn Guo <shawn.guo@linaro.org > writes:
mxs common clk porting for v3.5. It depends on the following two branches.
[1] git://git.linaro.org/people/mturquette/linux.git clk-next
[2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev
As the mxs device tree conversion will constantly touch clock files,
to save the conflicts, the updated mxs/dt branch coming later will
based on this pull-request.
* 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
ARM: mxs: remove old clock support
ARM: mxs: switch to common clk framework
ARM: mxs: change the lookup name for fec phy clock
ARM: mxs: request clock for timer
clk: mxs: add clock support for imx28
clk: mxs: add clock support for imx23
clk: mxs: add mxs specific clocks
Includes an update to Linux 3.4-rc6
Conflicts:
drivers/clk/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de >
2012-05-11 17:15:31 +02:00
2011-12-05 16:53:43 -08:00
2010-03-12 15:52:28 -08:00
2012-03-15 18:23:10 -07:00
2012-03-27 16:41:24 -07:00
2012-03-23 16:58:40 -07:00
2012-04-05 15:30:34 -07:00
2010-09-22 17:22:39 -07:00
2012-01-13 20:43:32 -08:00
2011-06-10 14:55:36 +02:00
2011-11-28 22:50:39 +08:00
2012-03-27 16:47:35 -07:00
2009-02-11 14:25:36 -08:00
2012-01-10 16:30:53 -08:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2007-05-08 11:15:18 -07:00
2012-03-23 16:58:40 -07:00
2012-03-23 16:58:39 -07:00
2011-06-01 19:29:39 -07:00
2012-01-10 16:30:53 -08:00
2010-03-30 22:02:32 +09:00
2012-01-10 16:30:53 -08:00
2010-10-29 19:06:53 +09:00
2012-03-23 16:58:39 -07:00
2012-04-25 21:26:34 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-04-12 13:12:12 -07:00
2012-03-23 16:58:39 -07:00
2011-08-10 15:54:24 -07:00
2012-03-23 16:58:39 -07:00
2009-04-02 01:05:31 +00:00
2012-04-25 17:03:44 +02:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2011-08-26 17:26:35 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-04-26 11:17:01 +02:00
2012-03-23 16:58:39 -07:00
2011-05-06 18:02:03 -07:00
2012-03-28 12:34:33 -07:00
2012-01-10 16:30:52 -08:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2011-05-06 18:02:04 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-03-23 17:36:29 -07:00
2012-04-12 13:12:12 -07:00
2012-03-23 16:58:39 -07:00
2011-03-09 11:25:04 -08:00
2009-04-02 01:05:32 +00:00
2012-01-10 10:29:42 +08:00
2012-03-23 16:58:39 -07:00
2012-04-12 13:12:12 -07:00
2011-05-06 18:02:05 -07:00
2010-10-27 15:30:32 +09:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-04-12 13:12:12 -07:00
2012-03-23 16:58:39 -07:00
2012-03-29 18:02:10 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2008-11-21 01:24:38 -08:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2008-11-14 16:37:54 -08:00
2010-03-12 15:52:28 -08:00
2011-07-25 20:57:17 -07:00
2011-03-09 11:25:07 -08:00
2011-05-17 14:44:36 -04:00
2012-04-12 13:12:12 -07:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-03-23 16:58:39 -07:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-03-23 16:58:39 -07:00
93c6d8927f