Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11f68120 authored by Shawn Guo's avatar Shawn Guo
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 0c831317

arch/arm/mach-imx/Makefile

+11 −16
Original line number Diff line number Diff line 
obj-y := time.o cpu.o system.o irq-common.o



obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o

obj-$(CONFIG_SOC_IMX1) += mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += mm-imx21.o



obj-$(CONFIG_SOC_IMX25) += clk-imx25.o cpu-imx25.o mach-imx25.o

obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o



obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o

obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o



obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o

obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o pm-imx3.o



imx5-pm-$(CONFIG_PM) += pm-imx5.o

obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o clk-imx51-imx53.o clk-cpu.o $(imx5-pm-y)



obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \

			    clk-pfd.o clk-busy.o clk.o \

			    clk-fixup-div.o clk-fixup-mux.o \

			    clk-gate-exclusive.o

obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)



obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o

obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
@@ -87,9 +82,9 @@ AFLAGS_headsmp.o :=-Wa,-march=armv7-a 
obj-$(CONFIG_SMP) += headsmp.o platsmp.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

endif

obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o

obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o

obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o mach-imx6sx.o

obj-$(CONFIG_SOC_IMX6Q) += mach-imx6q.o

obj-$(CONFIG_SOC_IMX6SL) += mach-imx6sl.o

obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o



ifeq ($(CONFIG_SUSPEND),y)

AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
@@ -101,7 +96,7 @@ obj-$(CONFIG_SOC_IMX50) += mach-imx50.o 
obj-$(CONFIG_SOC_IMX51) += mach-imx51.o

obj-$(CONFIG_SOC_IMX53) += mach-imx53.o



obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o

obj-$(CONFIG_SOC_VF610) += mach-vf610.o



obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o

drivers/clk/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ obj-$(CONFIG_ARCH_BERLIN) += berlin/ 
obj-$(CONFIG_ARCH_HI3xxx)		+= hisilicon/

obj-$(CONFIG_ARCH_HIP04)		+= hisilicon/

obj-$(CONFIG_ARCH_HIX5HD2)		+= hisilicon/

obj-$(CONFIG_ARCH_MXC)			+= imx/

obj-$(CONFIG_COMMON_CLK_KEYSTONE)	+= keystone/

ifeq ($(CONFIG_COMMON_CLK), y)

obj-$(CONFIG_ARCH_MMP)			+= mmp/

drivers/clk/imx/Makefile

0 → 100644
+25 −0
Original line number Diff line number Diff line 


obj-y += \

	clk.o \

	clk-busy.o \

	clk-cpu.o \

	clk-fixup-div.o \

	clk-fixup-mux.o \

	clk-gate-exclusive.o \

	clk-gate2.o \

	clk-pllv1.o \

	clk-pllv2.o \

	clk-pllv3.o \

	clk-pfd.o



obj-$(CONFIG_SOC_IMX1)   += clk-imx1.o

obj-$(CONFIG_SOC_IMX21)  += clk-imx21.o

obj-$(CONFIG_SOC_IMX25)  += clk-imx25.o

obj-$(CONFIG_SOC_IMX27)  += clk-imx27.o

obj-$(CONFIG_SOC_IMX31)  += clk-imx31.o

obj-$(CONFIG_SOC_IMX35)  += clk-imx35.o

obj-$(CONFIG_SOC_IMX5)   += clk-imx51-imx53.o

obj-$(CONFIG_SOC_IMX6Q)  += clk-imx6q.o

obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o

obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o

obj-$(CONFIG_SOC_VF610)  += clk-vf610.o

arch/arm/mach-imx/clk-busy.c→drivers/clk/imx/clk-busy.c

+0 −0

File moved.

View file

arch/arm/mach-imx/clk-cpu.c→drivers/clk/imx/clk-cpu.c

+0 −0

File moved.

View file