From e187942b9a8552b1ada3475af42aabe2f4335a62 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 9 Nov 2016 08:13:58 -0800 Subject: [PATCH] i.MX: Move clk code from 'mach-imx' to 'drivers' Move clk code from 'mach-imx' to 'drivers' to keep the code tree structure closer to that of analogous one from Linux kernel and, arguably although subjective, to keep 'mach-imx' less cluttered. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/Makefile | 22 +++++++++---------- drivers/clk/Makefile | 1 + drivers/clk/imx/Makefile | 20 +++++++++++++++++ .../clk/imx}/clk-gate-exclusive.c | 0 .../mach-imx => drivers/clk/imx}/clk-gate2.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx1.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx21.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx25.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx27.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx31.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx35.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx5.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx6.c | 0 .../mach-imx => drivers/clk/imx}/clk-imx6sx.c | 0 .../mach-imx => drivers/clk/imx}/clk-pfd.c | 0 .../mach-imx => drivers/clk/imx}/clk-pllv1.c | 0 .../mach-imx => drivers/clk/imx}/clk-pllv2.c | 0 .../mach-imx => drivers/clk/imx}/clk-pllv3.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk.h | 0 19 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 drivers/clk/imx/Makefile rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx5.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (100%) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 1f1a09920..1a153250a 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,26 +1,24 @@ obj-y += clocksource.o -obj-$(CONFIG_ARCH_IMX1) += imx1.o clk-imx1.o -obj-$(CONFIG_ARCH_IMX25) += imx25.o clk-imx25.o -obj-$(CONFIG_ARCH_IMX21) += imx21.o clk-imx21.o -obj-$(CONFIG_ARCH_IMX27) += imx27.o clk-imx27.o -obj-$(CONFIG_ARCH_IMX31) += imx31.o clk-imx31.o -obj-$(CONFIG_ARCH_IMX35) += imx35.o clk-imx35.o -obj-$(CONFIG_ARCH_IMX50) += imx50.o imx5.o clk-imx5.o +obj-$(CONFIG_ARCH_IMX1) += imx1.o +obj-$(CONFIG_ARCH_IMX25) += imx25.o +obj-$(CONFIG_ARCH_IMX21) += imx21.o +obj-$(CONFIG_ARCH_IMX27) += imx27.o +obj-$(CONFIG_ARCH_IMX31) += imx31.o +obj-$(CONFIG_ARCH_IMX35) += imx35.o +obj-$(CONFIG_ARCH_IMX50) += imx50.o imx5.o pbl-$(CONFIG_ARCH_IMX50) += imx50.o imx5.o -obj-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o clk-imx5.o +obj-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o pbl-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o -obj-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o clk-imx5.o esdctl-v4.o +obj-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o pbl-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o -obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o clk-imx6.o +obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o lwl-$(CONFIG_ARCH_IMX6) += imx6-mmdc.o -obj-$(CONFIG_ARCH_IMX6SX) += clk-imx6sx.o obj-$(CONFIG_ARCH_IMX6UL) += clk-imx6ul.o obj-$(CONFIG_ARCH_IMX_XLOAD) += xload.o obj-$(CONFIG_IMX_IIM) += iim.o obj-$(CONFIG_IMX_OCOTP) += ocotp.o obj-$(CONFIG_NAND_IMX) += nand.o lwl-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o -obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-pfd.o clk-gate2.o clk-gate-exclusive.o obj-y += devices.o imx.o obj-pbl-y += esdctl.o boot.o obj-$(CONFIG_BAREBOX_UPDATE) += imx-bbu-internal.o diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 0fe8f1e20..a4e4ed024 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_CLK_SOCFPGA) += socfpga.o obj-$(CONFIG_MACH_MIPS_ATH79) += clk-ar933x.o +obj-$(CONFIG_ARCH_IMX) += imx/ diff --git a/drivers/clk/imx/Makefile b/drivers/clk/imx/Makefile new file mode 100644 index 000000000..99dbe7d17 --- /dev/null +++ b/drivers/clk/imx/Makefile @@ -0,0 +1,20 @@ +obj-$(CONFIG_COMMON_CLK) += \ + clk-pllv1.o \ + clk-pllv2.o \ + clk-pllv3.o \ + clk-pfd.o \ + clk-gate2.o \ + clk-gate-exclusive.o + +obj-$(CONFIG_ARCH_IMX1) += clk-imx1.o +obj-$(CONFIG_ARCH_IMX25) += clk-imx25.o +obj-$(CONFIG_ARCH_IMX21) += clk-imx21.o +obj-$(CONFIG_ARCH_IMX27) += clk-imx27.o +obj-$(CONFIG_ARCH_IMX31) += clk-imx31.o +obj-$(CONFIG_ARCH_IMX35) += clk-imx35.o +obj-$(CONFIG_ARCH_IMX50) += clk-imx5.o +obj-$(CONFIG_ARCH_IMX51) += clk-imx5.o +obj-$(CONFIG_ARCH_IMX53) += clk-imx5.o +obj-$(CONFIG_ARCH_IMX6) += clk-imx6.o +obj-$(CONFIG_ARCH_IMX6SX) += clk-imx6sx.o +obj-$(CONFIG_ARCH_IMX6UL) += clk-imx6ul.o diff --git a/arch/arm/mach-imx/clk-gate-exclusive.c b/drivers/clk/imx/clk-gate-exclusive.c similarity index 100% rename from arch/arm/mach-imx/clk-gate-exclusive.c rename to drivers/clk/imx/clk-gate-exclusive.c diff --git a/arch/arm/mach-imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c similarity index 100% rename from arch/arm/mach-imx/clk-gate2.c rename to drivers/clk/imx/clk-gate2.c diff --git a/arch/arm/mach-imx/clk-imx1.c b/drivers/clk/imx/clk-imx1.c similarity index 100% rename from arch/arm/mach-imx/clk-imx1.c rename to drivers/clk/imx/clk-imx1.c diff --git a/arch/arm/mach-imx/clk-imx21.c b/drivers/clk/imx/clk-imx21.c similarity index 100% rename from arch/arm/mach-imx/clk-imx21.c rename to drivers/clk/imx/clk-imx21.c diff --git a/arch/arm/mach-imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c similarity index 100% rename from arch/arm/mach-imx/clk-imx25.c rename to drivers/clk/imx/clk-imx25.c diff --git a/arch/arm/mach-imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c similarity index 100% rename from arch/arm/mach-imx/clk-imx27.c rename to drivers/clk/imx/clk-imx27.c diff --git a/arch/arm/mach-imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c similarity index 100% rename from arch/arm/mach-imx/clk-imx31.c rename to drivers/clk/imx/clk-imx31.c diff --git a/arch/arm/mach-imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c similarity index 100% rename from arch/arm/mach-imx/clk-imx35.c rename to drivers/clk/imx/clk-imx35.c diff --git a/arch/arm/mach-imx/clk-imx5.c b/drivers/clk/imx/clk-imx5.c similarity index 100% rename from arch/arm/mach-imx/clk-imx5.c rename to drivers/clk/imx/clk-imx5.c diff --git a/arch/arm/mach-imx/clk-imx6.c b/drivers/clk/imx/clk-imx6.c similarity index 100% rename from arch/arm/mach-imx/clk-imx6.c rename to drivers/clk/imx/clk-imx6.c diff --git a/arch/arm/mach-imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c similarity index 100% rename from arch/arm/mach-imx/clk-imx6sx.c rename to drivers/clk/imx/clk-imx6sx.c diff --git a/arch/arm/mach-imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c similarity index 100% rename from arch/arm/mach-imx/clk-pfd.c rename to drivers/clk/imx/clk-pfd.c diff --git a/arch/arm/mach-imx/clk-pllv1.c b/drivers/clk/imx/clk-pllv1.c similarity index 100% rename from arch/arm/mach-imx/clk-pllv1.c rename to drivers/clk/imx/clk-pllv1.c diff --git a/arch/arm/mach-imx/clk-pllv2.c b/drivers/clk/imx/clk-pllv2.c similarity index 100% rename from arch/arm/mach-imx/clk-pllv2.c rename to drivers/clk/imx/clk-pllv2.c diff --git a/arch/arm/mach-imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c similarity index 100% rename from arch/arm/mach-imx/clk-pllv3.c rename to drivers/clk/imx/clk-pllv3.c diff --git a/arch/arm/mach-imx/clk.h b/drivers/clk/imx/clk.h similarity index 100% rename from arch/arm/mach-imx/clk.h rename to drivers/clk/imx/clk.h