From: Linus Torvalds Date: Mon, 23 Jan 2012 22:50:30 +0000 (-0800) Subject: Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... X-Git-Tag: v3.3-rc2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaed435a7b870a38d89dbdb535c7842d618d3214;p=platform%2Fkernel%2Flinux-stable.git Merge tag 'arm-soc-imx-move' of git://git./linux/kernel/git/arm/arm-soc Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. * tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM i.MX: Update defconfig ARM i.MX: Merge i.MX5 support into mach-imx ARM i.MX5: remove unnecessary includes from board files Fix up fairly trivial conflicts due to various changes nearby in arch/arm/{mach,plat}-imx/{Kconfig,Makefile} Pull request had been sent to the wrong email address, but happened before the merge window closed. I'm merging the MX 5 consolidation, since it apparently will help the next development window and will avoid conflicts later as per Arnd. --- eaed435a7b870a38d89dbdb535c7842d618d3214 diff --cc arch/arm/mach-imx/Kconfig index 0e6de36,ef6a6b8..09f357b --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@@ -22,6 -27,24 +22,18 @@@ config ARCH_MX2 config MACH_MX27 bool -config ARCH_MX31 - bool - -config ARCH_MX35 - bool - + config ARCH_MX5 + bool + + config ARCH_MX50 + bool + + config ARCH_MX51 + bool + + config ARCH_MX53 + bool + config SOC_IMX1 bool select ARCH_MX1 diff --cc arch/arm/mach-imx/Makefile index f5920c2,9cf630a..55db9c4 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@@ -70,8 -72,23 +72,27 @@@ AFLAGS_head-v7.o :=-Wa,-march=armv7- obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o -obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o pm-imx6q.o +obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o + +ifeq ($(CONFIG_PM),y) +obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o +endif + + # i.MX5 based machines + obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o + obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o + obj-$(CONFIG_MACH_MX53_EVK) += mach-mx53_evk.o + obj-$(CONFIG_MACH_MX53_SMD) += mach-mx53_smd.o + obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o + obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o + obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += mach-cpuimx51.o + obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o + obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o + obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o + obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o + obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o + obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o + obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o + + obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o + obj-$(CONFIG_MACH_IMX53_DT) += imx53-dt.o diff --cc arch/arm/mach-imx/Makefile.boot index 5f4d06a,2c12b78..6dfdbcc --- a/arch/arm/mach-imx/Makefile.boot +++ b/arch/arm/mach-imx/Makefile.boot @@@ -1,27 -1,35 +1,39 @@@ -zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000 -params_phys-$(CONFIG_ARCH_MX1) := 0x08000100 -initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000 +zreladdr-$(CONFIG_SOC_IMX1) += 0x08008000 +params_phys-$(CONFIG_SOC_IMX1) := 0x08000100 +initrd_phys-$(CONFIG_SOC_IMX1) := 0x08800000 -zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000 -params_phys-$(CONFIG_MACH_MX21) := 0xC0000100 -initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000 +zreladdr-$(CONFIG_SOC_IMX21) += 0xC0008000 +params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100 +initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000 -zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000 -params_phys-$(CONFIG_ARCH_MX25) := 0x80000100 -initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000 +zreladdr-$(CONFIG_SOC_IMX25) += 0x80008000 +params_phys-$(CONFIG_SOC_IMX25) := 0x80000100 +initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000 -zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000 -params_phys-$(CONFIG_MACH_MX27) := 0xA0000100 -initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000 +zreladdr-$(CONFIG_SOC_IMX27) += 0xA0008000 +params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100 +initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000 -zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000 -params_phys-$(CONFIG_ARCH_MX3) := 0x80000100 -initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000 +zreladdr-$(CONFIG_SOC_IMX31) += 0x80008000 +params_phys-$(CONFIG_SOC_IMX31) := 0x80000100 +initrd_phys-$(CONFIG_SOC_IMX31) := 0x80800000 + +zreladdr-$(CONFIG_SOC_IMX35) += 0x80008000 +params_phys-$(CONFIG_SOC_IMX35) := 0x80000100 +initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000 + zreladdr-$(CONFIG_SOC_IMX50) += 0x70008000 + params_phys-$(CONFIG_SOC_IMX50) := 0x70000100 + initrd_phys-$(CONFIG_SOC_IMX50) := 0x70800000 + + zreladdr-$(CONFIG_SOC_IMX51) += 0x90008000 + params_phys-$(CONFIG_SOC_IMX51) := 0x90000100 + initrd_phys-$(CONFIG_SOC_IMX51) := 0x90800000 + + zreladdr-$(CONFIG_SOC_IMX53) += 0x70008000 + params_phys-$(CONFIG_SOC_IMX53) := 0x70000100 + initrd_phys-$(CONFIG_SOC_IMX53) := 0x70800000 + zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100 initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000 diff --cc arch/arm/plat-mxc/Kconfig index b30708e,fdde4d1..dcebb12 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@@ -17,21 -17,12 +17,13 @@@ config ARCH_IMX_V4_V and ARMv5 SoCs config ARCH_IMX_V6_V7 - bool "i.MX3, i.MX6" + bool "i.MX3, i.MX5, i.MX6" select AUTO_ZRELADDR if !ZBOOT_ROM select ARM_PATCH_PHYS_VIRT + select MIGHT_HAVE_CACHE_L2X0 help - This enables support for systems based on the Freescale i.MX3 and i.MX6 - family. - - config ARCH_MX5 - bool "i.MX50, i.MX51, i.MX53" - select AUTO_ZRELADDR if !ZBOOT_ROM - select ARM_PATCH_PHYS_VIRT - help - This enables support for machines using Freescale's i.MX50 and i.MX53 - processors. + This enables support for systems based on the Freescale i.MX3, i.MX5 + and i.MX6 family. endchoice