From d109167b9c1002770d194644d5580a1f3588f7fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 10 Jun 2010 15:11:13 +0200 Subject: [PATCH] ARM: imx: rename mach dir for mx21 and mx27 to mach-imx MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König --- arch/arm/Makefile | 2 +- arch/arm/{mach-mx2 => mach-imx}/Kconfig | 0 arch/arm/{mach-mx2 => mach-imx}/Makefile | 6 +++--- arch/arm/{mach-mx2 => mach-imx}/Makefile.boot | 0 arch/arm/{mach-mx2/clock_imx21.c => mach-imx/clock-imx21.c} | 0 arch/arm/{mach-mx2/clock_imx27.c => mach-imx/clock-imx27.c} | 0 arch/arm/{mach-mx2/cpu_imx27.c => mach-imx/cpu-imx27.c} | 0 arch/arm/{mach-mx2 => mach-imx}/devices.c | 0 arch/arm/{mach-mx2 => mach-imx}/devices.h | 0 arch/arm/{mach-mx2 => mach-imx}/eukrea_mbimx27-baseboard.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-cpuimx27.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-imx27lite.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-mx21ads.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-mx27_3ds.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-mx27ads.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-mxt_td60.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-pca100.c | 0 arch/arm/{mach-mx2 => mach-imx}/mach-pcm038.c | 0 arch/arm/{mach-mx2 => mach-imx}/mm-imx21.c | 2 +- arch/arm/{mach-mx2 => mach-imx}/mm-imx27.c | 2 +- arch/arm/{mach-mx2 => mach-imx}/pcm970-baseboard.c | 0 arch/arm/{mach-mx2 => mach-imx}/serial.c | 0 arch/arm/plat-mxc/Kconfig | 2 +- 23 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/{mach-mx2 => mach-imx}/Kconfig (100%) rename arch/arm/{mach-mx2 => mach-imx}/Makefile (80%) rename arch/arm/{mach-mx2 => mach-imx}/Makefile.boot (100%) rename arch/arm/{mach-mx2/clock_imx21.c => mach-imx/clock-imx21.c} (100%) rename arch/arm/{mach-mx2/clock_imx27.c => mach-imx/clock-imx27.c} (100%) rename arch/arm/{mach-mx2/cpu_imx27.c => mach-imx/cpu-imx27.c} (100%) rename arch/arm/{mach-mx2 => mach-imx}/devices.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/devices.h (100%) rename arch/arm/{mach-mx2 => mach-imx}/eukrea_mbimx27-baseboard.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-cpuimx27.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-imx27lite.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-mx21ads.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-mx27_3ds.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-mx27ads.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-mxt_td60.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-pca100.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mach-pcm038.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/mm-imx21.c (98%) rename arch/arm/{mach-mx2 => mach-imx}/mm-imx27.c (98%) rename arch/arm/{mach-mx2 => mach-imx}/pcm970-baseboard.c (100%) rename arch/arm/{mach-mx2 => mach-imx}/serial.c (100%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 64ba313724d2..c60d604b2ef4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -146,7 +146,7 @@ machine-$(CONFIG_ARCH_MMP) := mmp machine-$(CONFIG_ARCH_MSM) := msm machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 machine-$(CONFIG_ARCH_MX1) := mx1 -machine-$(CONFIG_ARCH_MX2) := mx2 +machine-$(CONFIG_ARCH_MX2) := imx machine-$(CONFIG_ARCH_MX25) := mx25 machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_MX5) := mx5 diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-imx/Kconfig similarity index 100% rename from arch/arm/mach-mx2/Kconfig rename to arch/arm/mach-imx/Kconfig diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-imx/Makefile similarity index 80% rename from arch/arm/mach-mx2/Makefile rename to arch/arm/mach-imx/Makefile index e3254faac828..068f4937debd 100644 --- a/arch/arm/mach-mx2/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -6,10 +6,10 @@ obj-y := devices.o serial.o -obj-$(CONFIG_MACH_MX21) += clock_imx21.o mm-imx21.o +obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o -obj-$(CONFIG_MACH_MX27) += cpu_imx27.o -obj-$(CONFIG_MACH_MX27) += clock_imx27.o mm-imx27.o +obj-$(CONFIG_MACH_MX27) += cpu-imx27.o +obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o diff --git a/arch/arm/mach-mx2/Makefile.boot b/arch/arm/mach-imx/Makefile.boot similarity index 100% rename from arch/arm/mach-mx2/Makefile.boot rename to arch/arm/mach-imx/Makefile.boot diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-imx/clock-imx21.c similarity index 100% rename from arch/arm/mach-mx2/clock_imx21.c rename to arch/arm/mach-imx/clock-imx21.c diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-imx/clock-imx27.c similarity index 100% rename from arch/arm/mach-mx2/clock_imx27.c rename to arch/arm/mach-imx/clock-imx27.c diff --git a/arch/arm/mach-mx2/cpu_imx27.c b/arch/arm/mach-imx/cpu-imx27.c similarity index 100% rename from arch/arm/mach-mx2/cpu_imx27.c rename to arch/arm/mach-imx/cpu-imx27.c diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-imx/devices.c similarity index 100% rename from arch/arm/mach-mx2/devices.c rename to arch/arm/mach-imx/devices.c diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-imx/devices.h similarity index 100% rename from arch/arm/mach-mx2/devices.h rename to arch/arm/mach-imx/devices.h diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c similarity index 100% rename from arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c rename to arch/arm/mach-imx/eukrea_mbimx27-baseboard.c diff --git a/arch/arm/mach-mx2/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c similarity index 100% rename from arch/arm/mach-mx2/mach-cpuimx27.c rename to arch/arm/mach-imx/mach-cpuimx27.c diff --git a/arch/arm/mach-mx2/mach-imx27lite.c b/arch/arm/mach-imx/mach-imx27lite.c similarity index 100% rename from arch/arm/mach-mx2/mach-imx27lite.c rename to arch/arm/mach-imx/mach-imx27lite.c diff --git a/arch/arm/mach-mx2/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c similarity index 100% rename from arch/arm/mach-mx2/mach-mx21ads.c rename to arch/arm/mach-imx/mach-mx21ads.c diff --git a/arch/arm/mach-mx2/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c similarity index 100% rename from arch/arm/mach-mx2/mach-mx27_3ds.c rename to arch/arm/mach-imx/mach-mx27_3ds.c diff --git a/arch/arm/mach-mx2/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c similarity index 100% rename from arch/arm/mach-mx2/mach-mx27ads.c rename to arch/arm/mach-imx/mach-mx27ads.c diff --git a/arch/arm/mach-mx2/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c similarity index 100% rename from arch/arm/mach-mx2/mach-mxt_td60.c rename to arch/arm/mach-imx/mach-mxt_td60.c diff --git a/arch/arm/mach-mx2/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c similarity index 100% rename from arch/arm/mach-mx2/mach-pca100.c rename to arch/arm/mach-imx/mach-pca100.c diff --git a/arch/arm/mach-mx2/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c similarity index 100% rename from arch/arm/mach-mx2/mach-pcm038.c rename to arch/arm/mach-imx/mach-pcm038.c diff --git a/arch/arm/mach-mx2/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c similarity index 98% rename from arch/arm/mach-mx2/mm-imx21.c rename to arch/arm/mach-imx/mm-imx21.c index 64134314d012..115c21289125 100644 --- a/arch/arm/mach-mx2/mm-imx21.c +++ b/arch/arm/mach-imx/mm-imx21.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-mx2/mm-imx21.c + * arch/arm/mach-imx/mm-imx21.c * * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) * diff --git a/arch/arm/mach-mx2/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c similarity index 98% rename from arch/arm/mach-mx2/mm-imx27.c rename to arch/arm/mach-imx/mm-imx27.c index 3366ed44cfd5..89b41749e166 100644 --- a/arch/arm/mach-mx2/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-mx2/mm-imx27.c + * arch/arm/mach-imx/mm-imx27.c * * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) * diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-imx/pcm970-baseboard.c similarity index 100% rename from arch/arm/mach-mx2/pcm970-baseboard.c rename to arch/arm/mach-imx/pcm970-baseboard.c diff --git a/arch/arm/mach-mx2/serial.c b/arch/arm/mach-imx/serial.c similarity index 100% rename from arch/arm/mach-mx2/serial.c rename to arch/arm/mach-imx/serial.c diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 7f7ad6f289bd..4974fcc06735 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -49,7 +49,7 @@ config ARCH_MX5 endchoice source "arch/arm/mach-mx1/Kconfig" -source "arch/arm/mach-mx2/Kconfig" +source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-mx3/Kconfig" source "arch/arm/mach-mx25/Kconfig" source "arch/arm/mach-mxc91231/Kconfig" -- 2.34.1