From: Arnd Bergmann Date: Sat, 12 May 2012 22:11:06 +0000 (+0200) Subject: Merge branch 'spear/clock' into next/clock X-Git-Tag: firefly_0821_release~3680^2~2749^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eae0185a9677d3ff0c1781ee196f2ef42deb0ea1;p=firefly-linux-kernel-4.4.55.git Merge branch 'spear/clock' into next/clock Viresh Kumar writes: This is rebased over a (merge of Mike's/clk-next & SPEAr's DT) + Russell's patch: CLKDEV: provide helpers for common clock framework rebased over them. * spear/clock: 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 Conflicts: drivers/clk/Makefile [Arnd: rebased again without the spear/dt branch] Signed-off-by: Arnd Bergmann --- eae0185a9677d3ff0c1781ee196f2ef42deb0ea1 diff --cc drivers/clk/Makefile index 4a5bdbc30389,0f5e03d1ef5c..b9a5158a30b1 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -2,5 -2,6 +2,6 @@@ obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \ clk-mux.o clk-divider.o clk-fixed-factor.o -- + # SoCs specific +obj-$(CONFIG_ARCH_MXS) += mxs/ + obj-$(CONFIG_PLAT_SPEAR) += spear/