diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-11 02:50:00 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-12 05:46:51 -0400 |
commit | 3a84d17bb39754ff9ff51cb7c6bcbde8c4b924c9 (patch) | |
tree | c649c5776b92b01b6db4a7773b119eca1b2aef9c /arch/arm/mach-imx | |
parent | a6dd3c812e774b876d440c1a9ec1bd0fd5659390 (diff) |
ARM: i.MX remove last leftovers from legacy clock support
This also removes mach/clock.h along the way
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-pllv1.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 07f7c226e4cf..e407d928508e 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
@@ -12,7 +12,7 @@ obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx | |||
12 | obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o | 12 | obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o |
13 | 13 | ||
14 | obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ | 14 | obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ |
15 | clk-pfd.o clk-busy.o | 15 | clk-pfd.o clk-busy.o clk.o |
16 | 16 | ||
17 | # Support for CMOS sensor interface | 17 | # Support for CMOS sensor interface |
18 | obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o | 18 | obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o |
diff --git a/arch/arm/mach-imx/clk-pllv1.c b/arch/arm/mach-imx/clk-pllv1.c index 4a03c9360934..02be73178912 100644 --- a/arch/arm/mach-imx/clk-pllv1.c +++ b/arch/arm/mach-imx/clk-pllv1.c | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <linux/err.h> | 6 | #include <linux/err.h> |
7 | #include <mach/common.h> | 7 | #include <mach/common.h> |
8 | #include <mach/hardware.h> | 8 | #include <mach/hardware.h> |
9 | #include <mach/clock.h> | 9 | |
10 | #include "clk.h" | 10 | #include "clk.h" |
11 | 11 | ||
12 | /** | 12 | /** |
diff --git a/arch/arm/mach-imx/clk.c b/arch/arm/mach-imx/clk.c new file mode 100644 index 000000000000..f5e8be8e7f11 --- /dev/null +++ b/arch/arm/mach-imx/clk.c | |||
@@ -0,0 +1,3 @@ | |||
1 | #include <linux/spinlock.h> | ||
2 | |||
3 | DEFINE_SPINLOCK(imx_ccm_lock); | ||
diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index 1bf64fe2523c..5f2d8acca25f 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h | |||
@@ -3,7 +3,8 @@ | |||
3 | 3 | ||
4 | #include <linux/spinlock.h> | 4 | #include <linux/spinlock.h> |
5 | #include <linux/clk-provider.h> | 5 | #include <linux/clk-provider.h> |
6 | #include <mach/clock.h> | 6 | |
7 | extern spinlock_t imx_ccm_lock; | ||
7 | 8 | ||
8 | struct clk *imx_clk_pllv1(const char *name, const char *parent, | 9 | struct clk *imx_clk_pllv1(const char *name, const char *parent, |
9 | void __iomem *base); | 10 | void __iomem *base); |
diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index 5d08533ab2c7..8dc9d3edf17a 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
37 | #include <asm/mach/time.h> | 37 | #include <asm/mach/time.h> |
38 | 38 | ||
39 | #include <mach/clock.h> | ||
40 | #include <mach/common.h> | 39 | #include <mach/common.h> |
41 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
42 | #include <mach/iomux-mx3.h> | 41 | #include <mach/iomux-mx3.h> |