From: Linus Torvalds Date: Tue, 24 Jul 2012 23:40:57 +0000 (-0700) Subject: Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9161c3b796a2841a9a7be3d9c9dd121269ce90e8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux Pull common clk framework changes from Michael Turquette: "This includes a small number of core framework improvments, platform ports and new DT bindings." Fix up trivial conflicts in drivers/clk/Makefile * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (21 commits) clk: fix compile for OF && !COMMON_CLK clk: fix clk_get on of_clk_get_by_name return check clk: mxs: clk_register_clkdev mx28 usb clocks clk: add highbank clock support dt: add clock binding doc to primecell bindings clk: add DT fixed-clock binding support clk: add DT clock binding support ARM: integrator: convert to common clock clk: add versatile ICST307 driver ARM: integrator: put symbolic bus names on devices ARM: u300: convert to common clock clk: cache parent clocks only for muxes clk: wm831x: Add initial WM831x clock driver clk: Constify struct clk_init_data clk: Add CLK_IS_BASIC flag to identify basic clocks clk: Add support for rate table based dividers clk: Add support for power of two type dividers clk: mxs: imx28: decrease the frequency of ref_io1 for SSP2 and SSP3 clk: mxs: add clkdev lookup for pwm clk: mxs: Fix the GPMI clock name ... --- 9161c3b796a2841a9a7be3d9c9dd121269ce90e8 diff --cc arch/arm/Kconfig index c7e6d208fa8d,f3c60ff41692..b25c9d3c379a --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -336,8 -316,8 +336,9 @@@ config ARCH_VEXPRES select ICST select NO_IOPORT select PLAT_VERSATILE + select PLAT_VERSATILE_CLOCK select PLAT_VERSATILE_CLCD + select REGULATOR_FIXED_VOLTAGE if REGULATOR help This enables support for the ARM Ltd Versatile Express boards. diff --cc drivers/clk/Makefile index 3669761d1bac,02ffdf647b5e..5869ea387054 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -3,7 -3,11 +3,13 @@@ obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev. 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_NOMADIK) += clk-nomadik.o + obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o obj-$(CONFIG_ARCH_MXS) += mxs/ +obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ obj-$(CONFIG_PLAT_SPEAR) += spear/ + obj-$(CONFIG_ARCH_U300) += clk-u300.o + obj-$(CONFIG_ARCH_INTEGRATOR) += versatile/ + + # Chip specific + obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o