diff options
author | Michael Turquette <mturquette@linaro.org> | 2014-11-29 06:00:16 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2014-11-29 06:00:16 +0100 |
commit | b572b5f821abb350439609f367bd35961f53a28e (patch) | |
tree | 380542ae6d32a0f32763062af3194d9628560123 /drivers/clk/rockchip/Makefile | |
parent | clk: clk-s2mps11: fix semicolon.cocci warnings (diff) | |
parent | clk: rockchip: Add support for the mmc clock phases using the framework (diff) | |
download | linux-b572b5f821abb350439609f367bd35961f53a28e.tar.xz linux-b572b5f821abb350439609f367bd35961f53a28e.zip |
Merge tag 'v3.19-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
- clock phase setting capability for the rk3288 mmc clocks
- pll init to allow syncing to actual rate table values
- some more exported clocks
- fixes for some clocks (typos etc) all of them not yet used
in actual drivers
Diffstat (limited to 'drivers/clk/rockchip/Makefile')
-rw-r--r-- | drivers/clk/rockchip/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile index bd8514d63634..2714097f90db 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -6,6 +6,7 @@ obj-y += clk-rockchip.o obj-y += clk.o obj-y += clk-pll.o obj-y += clk-cpu.o +obj-y += clk-mmc-phase.o obj-$(CONFIG_RESET_CONTROLLER) += softrst.o obj-y += clk-rk3188.o |