Merge branch 'next/move' into for-next

Conflicts:
	arch/arm/mach-imx/Kconfig
	arch/arm/plat-mxc/Kconfig

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..70e9c14e2bbcafc776077aa2e5bc1c88dc321b79
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,0 -1,0 +1,26 @@@
++This file lists all branches that are pulled into the for-next branch
++of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
++and their external dependencies.
++
++next/cleanup
++  at91/ioremap                git://github.com/at91linux/linux-at91.git for-arnd-3.3-ioremap
++  at91/gpio           git://github.com/at91linux/linux-at91.git for-arnd-3.3-gpio
++  msm/misc            git://codeaurora.org/quic/kernel/davidb/linux-msm.git msm-misc
++  drivers/macb-gem-cleanup    parts of drivers/macb-gem that at91/gpio depends on
++  davinci/cleanup     git://gitorious.org/linux-davinci/linux-davinci.git cleanup
++
++next/drivers
++  drivers/macb-gem    git://github.com/jamieiles/linux-2.6-ji.git macb-gem
++  drivers/pxa-gpio    git://github.com/hzhuang1/linux.git gpio
++  at91/macb           git://github.com/at91linux/linux-at91.git for-arnd-3.3-driversV2
++                                      depends on drivers/macb-gem
++
++next/boards
++  samsung/board               git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next-samsung-devel
++                                      (craggamore parts only)
++
++next/timer
++  msm/timer           git://codeaurora.org/quic/kernel/davidb/linux-msm.git msm-timer
++
++next/move
++  imx/move            git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge

diff --cc arch/arm/mach-imx/Kconfig
index c44aa974e79c473d123631236269bdb8c2daa8a3,ef6a6b8f01cae9b94cf3e03b600ed26b0950d394..fbd414baa94dcc92999fda3440863aac0a013d9c
--- 1/arch/arm/mach-imx/Kconfig
--- 2/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.boot
index 5f4d06af491262a6ac6d75d7bcdeaee74684a16b,2c12b7889e97acc44b6af29771362972d355ef6f..6dfdbcc83afd7d4fb9e8245dfceed489e0c6970e
--- 1/arch/arm/mach-imx/Makefile.boot
--- 2/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/mach-imx/clock-mx51-mx53.c
Simple merge

diff --cc arch/arm/mach-imx/cpu-imx5.c
Simple merge

diff --cc arch/arm/mach-imx/imx51-dt.c
Simple merge

diff --cc arch/arm/mach-imx/imx53-dt.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_evk.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_loco.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_smd.c
Simple merge

diff --cc arch/arm/mach-imx/mm-imx5.c
Simple merge

diff --cc arch/arm/plat-mxc/Kconfig
Simple merge