784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3 - SHIFTPHONES/mainline/linux

commit	784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3	[log] [tgz]
author	Sascha Hauer <s.hauer@pengutronix.de>	Mon Nov 07 12:36:48 2011 +0100
committer	Sascha Hauer <s.hauer@pengutronix.de>	Wed Nov 16 08:37:37 2011 +0100
tree	e28d645f519b5bd86df3ae6f5d06704b1755f09b
parent	035c17dac4ce1f03d6831ff403f5aea7dcb927b4 [diff]

ARM i.MX: Merge i.MX5 support into mach-imx

This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx
and adjusts the Makefile/Kconfig entries in a way that it's possible
to compile i.MX5 together with i.MX3/6.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Dirk Behme <dirk.behme@de.bosch.com>

arch/arm/Makefile[diff]
arch/arm/mach-imx/Kconfig[diff]
arch/arm/mach-imx/Makefile[diff]
arch/arm/mach-imx/Makefile.boot[diff]
arch/arm/mach-imx/clock-mx51-mx53.c[Renamed from arch/arm/mach-mx5/clock-mx51-mx53.c - diff]
arch/arm/mach-imx/cpu-imx5.c[Renamed from arch/arm/mach-mx5/cpu.c - diff]
arch/arm/mach-imx/cpu_op-mx51.c[Renamed from arch/arm/mach-mx5/cpu_op-mx51.c - diff]
arch/arm/mach-imx/cpu_op-mx51.h[Renamed from arch/arm/mach-mx5/cpu_op-mx51.h - diff]
arch/arm/mach-imx/crm-regs-imx5.h[Renamed from arch/arm/mach-mx5/crm_regs.h - diff]
arch/arm/mach-imx/devices-imx50.h[Renamed from arch/arm/mach-mx5/devices-imx50.h - diff]
arch/arm/mach-imx/devices-imx51.h[Renamed from arch/arm/mach-mx5/devices-imx51.h - diff]
arch/arm/mach-imx/devices-imx53.h[Renamed from arch/arm/mach-mx5/devices-imx53.h - diff]
arch/arm/mach-imx/efika.h[Renamed from arch/arm/mach-mx5/efika.h - diff]
arch/arm/mach-imx/ehci-imx5.c[Renamed from arch/arm/mach-mx5/ehci.c - diff]
arch/arm/mach-imx/eukrea_mbimx51-baseboard.c[Renamed from arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c - diff]
arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c[Renamed from arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c - diff]
arch/arm/mach-imx/imx51-dt.c[Renamed from arch/arm/mach-mx5/imx51-dt.c - diff]
arch/arm/mach-imx/imx53-dt.c[Renamed from arch/arm/mach-mx5/imx53-dt.c - diff]
arch/arm/mach-imx/mach-cpuimx51.c[Renamed from arch/arm/mach-mx5/board-cpuimx51.c - diff]
arch/arm/mach-imx/mach-cpuimx51sd.c[Renamed from arch/arm/mach-mx5/board-cpuimx51sd.c - diff]
arch/arm/mach-imx/mach-mx50_rdp.c[Renamed from arch/arm/mach-mx5/board-mx50_rdp.c - diff]
arch/arm/mach-imx/mach-mx51_3ds.c[Renamed from arch/arm/mach-mx5/board-mx51_3ds.c - diff]
arch/arm/mach-imx/mach-mx51_babbage.c[Renamed from arch/arm/mach-mx5/board-mx51_babbage.c - diff]
arch/arm/mach-imx/mach-mx51_efikamx.c[Renamed from arch/arm/mach-mx5/board-mx51_efikamx.c - diff]
arch/arm/mach-imx/mach-mx51_efikasb.c[Renamed from arch/arm/mach-mx5/board-mx51_efikasb.c - diff]
arch/arm/mach-imx/mach-mx53_ard.c[Renamed from arch/arm/mach-mx5/board-mx53_ard.c - diff]
arch/arm/mach-imx/mach-mx53_evk.c[Renamed from arch/arm/mach-mx5/board-mx53_evk.c - diff]
arch/arm/mach-imx/mach-mx53_loco.c[Renamed from arch/arm/mach-mx5/board-mx53_loco.c - diff]
arch/arm/mach-imx/mach-mx53_smd.c[Renamed from arch/arm/mach-mx5/board-mx53_smd.c - diff]
arch/arm/mach-imx/mm-imx5.c[Renamed from arch/arm/mach-mx5/mm.c - diff]
arch/arm/mach-imx/mx51_efika.c[Renamed from arch/arm/mach-mx5/mx51_efika.c - diff]
arch/arm/mach-imx/pm-imx5.c[Added - diff]
arch/arm/mach-mx5/Kconfig[Deleted - diff]
arch/arm/mach-mx5/Makefile[Deleted - diff]
arch/arm/mach-mx5/Makefile.boot[Deleted - diff]
arch/arm/mach-mx5/pm-imx5.c[Deleted - diff]
arch/arm/mach-mx5/system.c[Deleted - diff]
arch/arm/plat-mxc/Kconfig[diff]

38 files changed

tree: e28d645f519b5bd86df3ae6f5d06704b1755f09b