Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc clock driver changes from Olof Johansson: "The new clock subsystem was merged in linux-3.4 without any users, this now moves the first three platforms over to it: imx, mxs and spear. The series also contains the changes for the clock subsystem itself, since Mike preferred to have it together with the platforms that require these changes, in order to avoid interdependencies and conflicts." Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code removed in one branch, added OF support in another) and drivers/dma/imx-sdma.c (independent changes next to each other). * tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits) clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate(). clk: Provide dummy clk_unregister() SPEAr: Update defconfigs SPEAr: Add SMI NOR partition info in dts files SPEAr: Switch to common clock framework SPEAr: Call clk_prepare() before calling clk_enable SPEAr: clk: Add General Purpose Timer Synthesizer clock SPEAr: clk: Add Fractional Synthesizer clock SPEAr: clk: Add Auxiliary Synthesizer clock SPEAr: clk: Add VCO-PLL Synthesizer clock SPEAr: Add DT bindings for SPEAr's timer ARM i.MX: remove now unused clock files ARM: i.MX6: implement clocks using common clock framework ARM i.MX35: implement clocks using common clock framework ARM i.MX5: implement clocks using common clock framework ARM: Kirkwood: Replace clock gating ARM: Orion: Audio: Add clk/clkdev support ARM: Orion: PCIE: Add support for clk ARM: Orion: XOR: Add support for clk ARM: Orion: CESA: Add support for clk ...
Showing
arch/arm/mach-imx/clk-busy.c
0 → 100644
arch/arm/mach-imx/clk-gate2.c
0 → 100644
arch/arm/mach-imx/clk-imx1.c
0 → 100644
arch/arm/mach-imx/clk-imx21.c
0 → 100644
arch/arm/mach-imx/clk-imx25.c
0 → 100644
arch/arm/mach-imx/clk-imx27.c
0 → 100644
arch/arm/mach-imx/clk-imx31.c
0 → 100644
arch/arm/mach-imx/clk-imx35.c
0 → 100644
此差异已折叠。
arch/arm/mach-imx/clk-imx6q.c
0 → 100644
此差异已折叠。
arch/arm/mach-imx/clk-pfd.c
0 → 100644
arch/arm/mach-imx/clk-pllv1.c
0 → 100644
arch/arm/mach-imx/clk-pllv2.c
0 → 100644
arch/arm/mach-imx/clk-pllv3.c
0 → 100644
arch/arm/mach-imx/clk.h
0 → 100644
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
arch/arm/mach-mxs/clock.c
已删除
100644 → 0
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
arch/arm/plat-spear/clock.c
已删除
100644 → 0
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
drivers/clk/clk-fixed-factor.c
0 → 100644
此差异已折叠。
此差异已折叠。
此差异已折叠。
drivers/clk/mxs/Makefile
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk-div.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk-frac.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk-imx23.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk-imx28.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk-pll.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk-ref.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk.c
0 → 100644
此差异已折叠。
drivers/clk/mxs/clk.h
0 → 100644
此差异已折叠。
drivers/clk/spear/Makefile
0 → 100644
此差异已折叠。
drivers/clk/spear/clk-aux-synth.c
0 → 100644
此差异已折叠。
此差异已折叠。
drivers/clk/spear/clk-gpt-synth.c
0 → 100644
此差异已折叠。
drivers/clk/spear/clk-vco-pll.c
0 → 100644
此差异已折叠。
drivers/clk/spear/clk.c
0 → 100644
此差异已折叠。
drivers/clk/spear/clk.h
0 → 100644
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
include/linux/spi/orion_spi.h
已删除
100644 → 0
此差异已折叠。
想要评论请 注册 或 登录