diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-04-28 12:02:39 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-08 12:02:41 -0400 |
commit | 2664681fa4101aef2bceb81bbe26a81a88131393 (patch) | |
tree | 2a7e24a19c50da323956accbde0ca13b613bff30 | |
parent | e80d76f84660268859ab82e82fd78c1ce8439323 (diff) |
ARM: mxs: switch to common clk framework
It switches mxs clock support to common clk framework based drivers.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-mxs/Makefile | 5 | ||||
-rw-r--r-- | drivers/clk/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 36586dba6fa6..2095a513a7c0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -468,6 +468,7 @@ config ARCH_MXS | |||
468 | select ARCH_REQUIRE_GPIOLIB | 468 | select ARCH_REQUIRE_GPIOLIB |
469 | select CLKDEV_LOOKUP | 469 | select CLKDEV_LOOKUP |
470 | select CLKSRC_MMIO | 470 | select CLKSRC_MMIO |
471 | select COMMON_CLK | ||
471 | select HAVE_CLK_PREPARE | 472 | select HAVE_CLK_PREPARE |
472 | help | 473 | help |
473 | Support for Freescale MXS-based family of processors | 474 | Support for Freescale MXS-based family of processors |
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 908bf9a567f1..6ce21a26412e 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile | |||
@@ -1,12 +1,9 @@ | |||
1 | # Common support | 1 | # Common support |
2 | obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o mm.o | 2 | obj-y := devices.o icoll.o iomux.o system.o timer.o mm.o |
3 | 3 | ||
4 | obj-$(CONFIG_MXS_OCOTP) += ocotp.o | 4 | obj-$(CONFIG_MXS_OCOTP) += ocotp.o |
5 | obj-$(CONFIG_PM) += pm.o | 5 | obj-$(CONFIG_PM) += pm.o |
6 | 6 | ||
7 | obj-$(CONFIG_SOC_IMX23) += clock-mx23.o | ||
8 | obj-$(CONFIG_SOC_IMX28) += clock-mx28.o | ||
9 | |||
10 | obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o | 7 | obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o |
11 | obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o | 8 | obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o |
12 | obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o | 9 | obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o |
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 1f736bc11c4b..a576f5447d38 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile | |||
@@ -2,3 +2,5 @@ | |||
2 | obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o | 2 | obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o |
3 | obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \ | 3 | obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \ |
4 | clk-mux.o clk-divider.o | 4 | clk-mux.o clk-divider.o |
5 | |||
6 | obj-$(CONFIG_ARCH_MXS) += mxs/ | ||