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
2012-04-15 17:35:19 -07:00
2012-03-06 15:16:18 -05:00
2012-03-28 10:01:29 -07:00
2012-03-27 00:37:23 +01:00
2012-04-23 14:23:32 +03:00
2012-04-16 16:45:34 +02:00
2012-03-17 12:20:44 -07:00
2012-04-16 21:27:07 +02:00
2012-03-24 10:41:37 -07:00
2012-04-20 20:30:19 -04:00
2012-03-30 17:31:56 -07:00
2012-03-26 21:06:30 +02:00
2012-03-07 17:40:56 +01:00
2012-04-09 16:29:34 +02:00
2012-04-16 15:19:12 -04:00
2012-04-11 09:31:01 +02:00
2012-04-02 14:41:25 -07:00
2012-03-26 20:41:01 +04:00
2012-03-13 11:21:23 +11:00
2012-04-04 10:09:30 -07:00
2012-04-27 11:03:38 -06:00
2012-03-24 10:08:39 -07:00
2012-03-26 11:48:54 -04:00
2012-04-24 13:55:43 -07:00
2012-03-16 10:38:24 -04:00
2012-03-30 16:45:39 -07:00
2012-03-01 16:14:48 +01:00
2012-03-22 09:31:55 -04:00
2012-03-24 10:41:37 -07:00
2012-03-01 13:38:49 +01:00
2012-03-07 17:06:08 +11:00
2012-03-16 10:38:24 -04:00
2012-03-20 21:29:40 -04:00
2012-03-20 21:29:46 -04:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:34 -07:00
2012-03-30 12:33:28 +02:00
2012-03-04 17:54:35 -05:00
2012-03-16 10:38:24 -04:00
2012-03-24 10:41:37 -07:00
2012-03-21 17:55:01 -07:00
2012-05-08 14:13:25 -07:00
2012-05-08 14:13:25 -07:00
2012-05-11 17:13:00 +02:00
2012-05-02 09:30:32 +01:00
2012-03-28 18:30:03 +01:00
2012-03-21 17:54:56 -07:00
2012-03-29 18:12:23 -07:00
2012-03-23 16:58:36 -07:00
2012-02-28 16:02:54 +01:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:41:37 -07:00
2012-03-30 03:23:30 -04:00
2012-03-29 15:38:31 +10:30
2012-03-29 14:46:05 -07:00
2012-03-16 10:38:24 -04:00
2012-03-23 16:58:38 -07:00
2012-03-24 10:08:39 -07:00
2012-03-29 19:52:48 +08:00
2012-03-20 21:29:37 -04:00
2012-03-03 09:02:52 -07:00
2012-03-28 15:58:21 -07:00
2012-03-20 21:29:53 -04:00
2012-03-17 21:51:34 +01:00
2012-03-21 18:55:10 -07:00
2012-03-28 16:36:44 +02:00
2012-03-28 15:02:41 -07:00
2012-04-04 17:13:43 -07:00
2012-04-10 15:30:16 -07:00
2012-03-28 14:24:40 -07:00
2012-04-30 15:30:18 -07:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:53:13 -08:00
2012-04-06 02:43:12 -04:00
2012-03-31 16:03:16 -04:00
2012-03-24 10:41:37 -07:00
2012-03-20 21:29:32 -04:00
2012-03-18 22:15:39 +01:00
2012-04-02 14:41:27 -07:00
2012-04-05 15:30:34 -07:00
2012-03-04 17:54:34 -05:00
2012-03-14 08:47:58 -04:00
2012-04-12 12:57:08 +02:00
2012-03-02 10:38:33 +01:00
2012-02-28 17:10:21 +00:00
2012-03-19 17:56:18 -07:00
2012-04-27 10:46:45 +08:00
2012-03-28 14:08:46 -07:00
2012-03-24 10:08:39 -07:00
2012-03-21 17:55:02 -07:00
2012-03-21 17:54:59 -07:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 13:36:04 -07:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2012-03-27 22:45:26 -04:00
2012-03-04 20:41:38 -05:00
2012-03-24 10:08:39 -07:00
2012-03-16 23:00:20 -07:00
2012-03-21 17:54:59 -07:00
2012-03-09 10:56:35 -08:00
2012-03-28 18:30:03 +01:00
2012-03-04 17:54:34 -05:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-04-23 11:04:29 +10:00
2012-04-12 00:37:48 -06:00
2012-03-04 20:41:38 -05:00
2012-03-13 22:45:38 -04:00
2012-03-13 22:45:25 -04:00
2012-02-28 20:01:08 +01:00
2012-03-16 10:38:24 -04:00
2012-03-08 10:50:35 -08:00
2012-04-02 09:50:40 -07:00
2012-04-12 18:35:58 -07:00
2012-03-21 17:54:57 -07:00
2012-03-31 13:34:04 -07:00
2012-03-23 08:53:47 -07:00
2012-03-08 10:50:35 -08:00
2012-03-29 17:41:25 -05:00
2012-03-28 23:30:28 +02:00
2012-03-05 15:49:42 -08:00
2012-03-04 17:54:34 -05:00
2012-04-11 22:55:25 -03:00
2012-03-08 14:11:36 +02:00
2012-03-23 16:58:35 -07:00
2012-03-23 16:58:34 -07:00
2012-04-23 12:11:47 +01:00
2012-03-28 18:30:03 +01:00
2012-03-23 16:58:33 -07:00
2012-03-26 20:40:59 +04:00
2012-04-03 09:49:59 -07:00
2012-03-23 16:58:31 -07:00
2012-03-16 10:38:24 -04:00
2012-03-15 21:41:34 +01:00
2012-03-03 15:04:45 -05:00
2012-03-21 17:55:02 -07:00
2012-03-04 17:54:34 -05:00
2012-03-21 17:54:57 -07:00
2012-04-21 01:58:20 -04:00
2012-03-21 17:54:56 -07:00
2012-03-27 16:30:09 -07:00
2012-03-26 12:50:52 +10:30
2012-03-26 12:50:51 +10:30
2012-03-27 08:26:34 +01:00
2012-04-03 17:23:23 -04:00
2012-04-24 00:16:24 -04:00
2012-03-06 15:16:19 -05:00
2012-03-26 11:48:54 -04:00
2012-03-02 17:18:10 -05:00
2012-03-21 09:31:44 -04:00
2012-03-05 15:26:47 -05:00
2012-03-17 11:09:33 -04:00
2012-04-20 23:14:28 -04:00
2012-03-04 17:54:34 -05:00
2012-03-12 14:19:34 -04:00
2012-03-23 16:58:31 -07:00
2012-03-24 10:41:37 -07:00
2012-03-15 23:28:19 +08:00
2012-03-05 08:09:09 -07:00
2012-03-28 14:41:36 -07:00
2012-03-21 17:54:58 -07:00
2012-03-16 10:38:24 -04:00
2012-03-14 17:25:56 +08:00
2012-03-21 17:55:01 -07:00
2012-03-24 10:08:39 -07:00
2012-03-28 18:30:03 +01:00
2012-03-04 20:54:01 -05:00
2012-03-23 14:02:12 -07:00
2012-03-04 09:34:15 -08:00
2012-03-24 08:46:59 +01:00
2012-03-16 10:38:24 -04:00
2012-03-28 17:14:36 -07:00
2012-04-29 13:12:42 -07:00
2012-03-24 10:41:37 -07:00
2012-03-28 23:31:24 +02:00
2012-03-04 23:08:46 +01:00
2012-03-16 21:49:24 +01:00
2012-03-23 16:58:38 -07:00
2012-03-04 17:54:34 -05:00
2012-03-16 10:38:24 -04:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-23 16:58:32 -07:00
2012-03-01 10:28:04 +01:00
2012-03-20 11:16:20 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:38 -04:00
2012-03-28 17:14:37 -07:00
2012-03-24 10:08:39 -07:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:43 -04:00
2012-03-20 21:29:42 -04:00
2012-03-04 17:54:34 -05:00
2012-03-06 19:14:37 +02:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-21 17:54:57 -07:00
2012-03-15 18:23:10 -07:00
2012-03-28 18:30:03 +01:00
2012-03-07 11:32:21 +00:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2012-03-21 13:25:04 -07:00
2012-03-24 10:08:39 -07:00
2012-05-04 15:13:54 -07:00
2012-04-09 10:38:30 -07:00
2012-03-16 10:38:24 -04:00
2012-03-08 11:38:50 -08:00
2012-03-12 22:19:13 +01:00
2012-05-01 09:40:19 -04:00
2012-03-06 11:01:33 +02:00
2012-03-28 15:04:26 -07:00
2012-03-28 17:14:35 -07:00
2012-03-19 16:53:08 -04:00
2012-04-05 19:04:27 -04:00
2012-03-23 13:18:57 +01:00
2012-03-28 15:58:21 -07:00
2012-04-14 07:47:49 -07:00
2012-03-28 18:30:03 +01:00
2012-04-05 15:25:51 -07:00
2012-03-04 17:54:34 -05:00
2012-03-04 17:54:34 -05:00
2012-03-13 14:06:33 -04:00
2012-03-01 17:57:40 -05:00
2012-03-29 18:12:23 -07:00
2012-03-22 19:43:43 -07:00
2012-03-20 21:29:40 -04:00
2012-03-23 16:58:40 -07:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:38:51 -08:00
2012-03-28 18:30:03 +01:00
2012-04-10 22:39:17 -06:00
2012-03-13 14:24:07 -07:00
2012-04-11 09:36:00 +01:00
2012-03-19 15:33:24 -03:00
2012-03-04 17:54:34 -05:00
2012-03-27 16:30:09 -07:00
2012-03-31 08:09:50 +05:30
2012-04-25 21:26:33 -07:00
2012-03-08 10:50:35 -08:00
2012-03-28 18:30:03 +01:00
2012-03-27 20:15:37 +02:00
2012-03-02 10:51:00 +01:00
2012-03-07 16:08:46 +01:00
93c6d8927f