tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: imx: move clock drivers into drivers/clk

After the cleanup on clock drivers, they are now ready to be moved into
drivers/clk. Let's move them into drivers/clk/imx folder.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>

Shawn Guo 11f68120 0c831317

+37 -16
+11 -16
arch/arm/mach-imx/Makefile
··· 1 1 obj-y := time.o cpu.o system.o irq-common.o 2 2 3 - obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o 4 - obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o 3 + obj-$(CONFIG_SOC_IMX1) += mm-imx1.o 4 + obj-$(CONFIG_SOC_IMX21) += mm-imx21.o 5 5 6 - obj-$(CONFIG_SOC_IMX25) += clk-imx25.o cpu-imx25.o mach-imx25.o 6 + obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o 7 7 8 8 obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o 9 - obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o 9 + obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o 10 10 11 - obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o 12 - obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o 11 + obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o 12 + obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o pm-imx3.o 13 13 14 14 imx5-pm-$(CONFIG_PM) += pm-imx5.o 15 - obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o clk-imx51-imx53.o clk-cpu.o $(imx5-pm-y) 16 - 17 - obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ 18 - clk-pfd.o clk-busy.o clk.o \ 19 - clk-fixup-div.o clk-fixup-mux.o \ 20 - clk-gate-exclusive.o 15 + obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y) 21 16 22 17 obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o 23 18 obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o ··· 82 87 obj-$(CONFIG_SMP) += headsmp.o platsmp.o 83 88 obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 84 89 endif 85 - obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o 86 - obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o 87 - obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o mach-imx6sx.o 90 + obj-$(CONFIG_SOC_IMX6Q) += mach-imx6q.o 91 + obj-$(CONFIG_SOC_IMX6SL) += mach-imx6sl.o 92 + obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o 88 93 89 94 ifeq ($(CONFIG_SUSPEND),y) 90 95 AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a ··· 96 101 obj-$(CONFIG_SOC_IMX51) += mach-imx51.o 97 102 obj-$(CONFIG_SOC_IMX53) += mach-imx53.o 98 103 99 - obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o 104 + obj-$(CONFIG_SOC_VF610) += mach-vf610.o 100 105 101 106 obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o 102 107
arch/arm/mach-imx/clk-busy.c drivers/clk/imx/clk-busy.c
arch/arm/mach-imx/clk-cpu.c drivers/clk/imx/clk-cpu.c
arch/arm/mach-imx/clk-fixup-div.c drivers/clk/imx/clk-fixup-div.c
arch/arm/mach-imx/clk-fixup-mux.c drivers/clk/imx/clk-fixup-mux.c
arch/arm/mach-imx/clk-gate-exclusive.c drivers/clk/imx/clk-gate-exclusive.c
arch/arm/mach-imx/clk-gate2.c drivers/clk/imx/clk-gate2.c
arch/arm/mach-imx/clk-imx1.c drivers/clk/imx/clk-imx1.c
arch/arm/mach-imx/clk-imx21.c drivers/clk/imx/clk-imx21.c
arch/arm/mach-imx/clk-imx25.c drivers/clk/imx/clk-imx25.c
arch/arm/mach-imx/clk-imx27.c drivers/clk/imx/clk-imx27.c
arch/arm/mach-imx/clk-imx31.c drivers/clk/imx/clk-imx31.c
arch/arm/mach-imx/clk-imx35.c drivers/clk/imx/clk-imx35.c
arch/arm/mach-imx/clk-imx51-imx53.c drivers/clk/imx/clk-imx51-imx53.c
arch/arm/mach-imx/clk-imx6q.c drivers/clk/imx/clk-imx6q.c
arch/arm/mach-imx/clk-imx6sl.c drivers/clk/imx/clk-imx6sl.c
arch/arm/mach-imx/clk-imx6sx.c drivers/clk/imx/clk-imx6sx.c
arch/arm/mach-imx/clk-pfd.c drivers/clk/imx/clk-pfd.c
arch/arm/mach-imx/clk-pllv1.c drivers/clk/imx/clk-pllv1.c
arch/arm/mach-imx/clk-pllv2.c drivers/clk/imx/clk-pllv2.c
arch/arm/mach-imx/clk-pllv3.c drivers/clk/imx/clk-pllv3.c
arch/arm/mach-imx/clk-vf610.c drivers/clk/imx/clk-vf610.c
arch/arm/mach-imx/clk.c drivers/clk/imx/clk.c
arch/arm/mach-imx/clk.h drivers/clk/imx/clk.h
+1
drivers/clk/Makefile
··· 50 50 obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/ 51 51 obj-$(CONFIG_ARCH_HIP04) += hisilicon/ 52 52 obj-$(CONFIG_ARCH_HIX5HD2) += hisilicon/ 53 + obj-$(CONFIG_ARCH_MXC) += imx/ 53 54 obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ 54 55 ifeq ($(CONFIG_COMMON_CLK), y) 55 56 obj-$(CONFIG_ARCH_MMP) += mmp/
+25
drivers/clk/imx/Makefile
··· 1 + 2 + obj-y += \ 3 + clk.o \ 4 + clk-busy.o \ 5 + clk-cpu.o \ 6 + clk-fixup-div.o \ 7 + clk-fixup-mux.o \ 8 + clk-gate-exclusive.o \ 9 + clk-gate2.o \ 10 + clk-pllv1.o \ 11 + clk-pllv2.o \ 12 + clk-pllv3.o \ 13 + clk-pfd.o 14 + 15 + obj-$(CONFIG_SOC_IMX1) += clk-imx1.o 16 + obj-$(CONFIG_SOC_IMX21) += clk-imx21.o 17 + obj-$(CONFIG_SOC_IMX25) += clk-imx25.o 18 + obj-$(CONFIG_SOC_IMX27) += clk-imx27.o 19 + obj-$(CONFIG_SOC_IMX31) += clk-imx31.o 20 + obj-$(CONFIG_SOC_IMX35) += clk-imx35.o 21 + obj-$(CONFIG_SOC_IMX5) += clk-imx51-imx53.o 22 + obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o 23 + obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o 24 + obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o 25 + obj-$(CONFIG_SOC_VF610) += clk-vf610.o