Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx...

Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5.  This is handled
in 03e09cd8902717b66f940357257d8ad76114d9f2.

arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32
and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c.  The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad565c9bbceeed8b607f140c29df97355, so
arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted.

Conflicts:
	arch/arm/plat-mxc/Kconfig
	arch/arm/plat-mxc/Makefile
	arch/arm/plat-mxc/iomux-mx1-mx2.c

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --cc arch/arm/mach-mx2/mach-pca100.c
Simple merge

diff --cc arch/arm/mach-mx2/mach-pcm038.c
Simple merge

diff --cc arch/arm/mach-mx25/mach-mx25pdk.c
index cb85e2e,99b9463..83d7410
--- 1/arch/arm/mach-mx25/mach-mx25pdk.c
--- 2/arch/arm/mach-mx25/mach-mx25pdk.c
+++ b/arch/arm/mach-mx25/mach-mx25pdk.c
@@@ -35,8 -35,9 +35,9 @@@
  #include <mach/imx-uart.h>
  #include <mach/mx25.h>
  #include <mach/mxc_nand.h>
+ #include <mach/imxfb.h>
  #include "devices.h"
 -#include <mach/iomux.h>
 +#include <mach/iomux-mx25.h>
  
  static struct imxuart_platform_data uart_pdata = {
        .flags = IMXUART_HAVE_RTSCTS,

diff --cc arch/arm/plat-mxc/Kconfig
index 6debae2,44f3a80..7f7ad6f
--- 1/arch/arm/plat-mxc/Kconfig
--- 2/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@@ -23,6 -23,9 +23,8 @@@ config ARCH_MX
  config ARCH_MX25
        bool "MX25-based"
        select CPU_ARM926T
 -      select COMMON_CLKDEV
+       select ARCH_MXC_IOMUX_V3
+       select HAVE_FB_IMX
        help
          This enables support for systems based on the Freescale i.MX25 family
  
@@@ -38,6 -42,14 +40,12 @@@ config ARCH_MXC9123
        help
          This enables support for systems based on the Freescale MXC91231 family
  
 -      select COMMON_CLKDEV
+ config ARCH_MX5
+       bool "MX5-based"
+       select CPU_V7
+       help
+         This enables support for systems based on the Freescale i.MX51 family
+ 
  endchoice
  
  source "arch/arm/mach-mx1/Kconfig"
@@@ -58,8 -72,17 +67,16 @@@ config MXC_IRQ_PRIO
          requirements for timing.
          Say N here, unless you have a specialized requirement.
  
+ config MXC_TZIC
+       bool "Enable TrustZone Interrupt Controller"
+       depends on ARCH_MX51
+       help
+         This will be automatically selected for all processors
+         containing this interrupt controller.
+         Say N here only if you are really sure.
+ 
  config MXC_PWM
        tristate "Enable PWM driver"
 -      depends on ARCH_MXC
        select HAVE_PWM
        help
          Enable support for the i.MX PWM controller(s).

diff --cc arch/arm/plat-mxc/Makefile
index 9465a01,a4bc6cb..a72a5e4
--- 1/arch/arm/plat-mxc/Makefile
--- 2/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@@ -5,9 -5,13 +5,12 @@@
  # Common support
  obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o
  
 -obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o
 -obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o
 -CFLAGS_iomux-mx1-mx2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
 -CFLAGS_dma-mx1-mx2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
+ # MX51 uses the TZIC interrupt controller, older platforms use AVIC (irq.o)
+ obj-$(CONFIG_MXC_TZIC) += tzic.o
+ 
 +obj-$(CONFIG_ARCH_MX1) += dma-mx1-mx2.o
 +obj-$(CONFIG_ARCH_MX2) += dma-mx1-mx2.o
 +obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
  obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
  obj-$(CONFIG_MXC_PWM)  += pwm.o
  obj-$(CONFIG_USB_EHCI_MXC) += ehci.o

diff --cc arch/arm/plat-mxc/include/mach/iomux-mx25.h
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/irqs.h
index 7ebdd71,a3ad643..86781f7
--- 1/arch/arm/plat-mxc/include/mach/irqs.h
--- 2/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/plat-mxc/include/mach/irqs.h
@@@ -18,17 -22,18 +22,19 @@@
  
  #define MXC_GPIO_IRQ_START    MXC_INTERNAL_IRQS
  
 -#if defined CONFIG_ARCH_MX1
 -#define MXC_GPIO_IRQS         (32 * 4)
 -#elif defined CONFIG_ARCH_MX2
 +/* these are ordered by size to support multi-SoC kernels */
 +#if defined CONFIG_ARCH_MX2
  #define MXC_GPIO_IRQS         (32 * 6)
 -#elif defined CONFIG_ARCH_MX3
 -#define MXC_GPIO_IRQS         (32 * 3)
 +#elif defined CONFIG_ARCH_MX1
 +#define MXC_GPIO_IRQS         (32 * 4)
  #elif defined CONFIG_ARCH_MX25
  #define MXC_GPIO_IRQS         (32 * 4)
+ #elif defined CONFIG_ARCH_MX5
+ #define MXC_GPIO_IRQS         (32 * 4)
  #elif defined CONFIG_ARCH_MXC91231
  #define MXC_GPIO_IRQS         (32 * 4)
 +#elif defined CONFIG_ARCH_MX3
 +#define MXC_GPIO_IRQS         (32 * 3)
  #endif
  
  /*

diff --cc arch/arm/plat-mxc/include/mach/memory.h
Simple merge