ARM: imx: multiplatform support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

8 files changed, 20 insertions, 3 deletions

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2f439ce7944..0d9a4fd2abc 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -221,6 +221,7 @@ machine-$(CONFIG_ARCH_MULTI_OMAP2PLUS)	+= omap2
 machine-$(CONFIG_ARCH_MULTI_UX500)	+= ux500
 machine-$(CONFIG_ARCH_MULTI_IMX)	+= imx
 machine-$(CONFIG_ARCH_MULTI_MXS)	+= mxs
+machine-$(CONFIG_ARCH_MULTI_VERSATILE)	+= versatile
 plat-$(CONFIG_PLAT_VERSATILE)		+= versatile
 plat-$(CONFIG_ARCH_MULTI_OMAP2PLUS)	+= omap
 plat-$(CONFIG_ARCH_MULTI_UX500)		+= nomadik
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 073e49aebe7..de3c17f096c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -127,6 +127,7 @@ config ARCH_MX1ADS
 config MACH_SCB9328
 	bool "Synertronixx scb9328"
 	select IMX_HAVE_PLATFORM_IMX_UART
+	select SOC_IMX1
 	help
 	  Say Y here if you are using a Synertronixx scb9328 board
 
diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index 683520bb2e1..bc3a6127b68 100644
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -16,6 +16,7 @@
 #include <asm/mach/time.h>
 #include <mach-imx/common.h>
 #include <mach-imx/mx27.h>
+#include <mach-imx/irqs.h>
 
 static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART1_BASE_ADDR, "imx21-uart.0", NULL),
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 1474a42961b..deaf9d3b1c6 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -42,6 +42,7 @@
 #include <mach-imx/common.h>
 #include <mach-imx/hardware.h>
 #include <mach-imx/iomux-mx27.h>
+#include <mach-imx/irqs.h>
 
 #include "devices-imx27.h"
 
diff --git a/arch/arm/mach-multi/Kconfig b/arch/arm/mach-multi/Kconfig
index d401f41800b..b00e08082d2 100644
--- a/arch/arm/mach-multi/Kconfig
+++ b/arch/arm/mach-multi/Kconfig
@@ -135,6 +135,18 @@ config ARCH_MULTI_IMX6
 	select ARCH_IMX_V6_V7
 	select SOC_IMX6Q
 
+config ARCH_MULTI_IMX1
+	bool "Freescale i.MX1"
+	depends on ARCH_MULTI_V4
+	select ARCH_MULTI_IMX
+	select ARCH_MX1ADS
+
+config ARCH_MULTI_IMX2
+	bool "Freescale i.MX2"
+	depends on ARCH_MULTI_V5
+	select ARCH_MULTI_IMX
+	select MACH_IMX27_DT
+
 config ARCH_MULTI_MXS
 	bool "Freescale MXS"
 	depends on ARCH_MULTI_V5
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index f46072cbe8f..a54d863e71b 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -10,7 +10,7 @@ choice
 
 config ARCH_IMX_V4_V5
 	bool "i.MX1, i.MX21, i.MX25, i.MX27"
-	depends on !MACH_MULTI_V6_V7
+	depends on !ARCH_MULTI_V6_V7
 	select AUTO_ZRELADDR if !ZBOOT_ROM
 	select ARM_PATCH_PHYS_VIRT
 	help
@@ -19,7 +19,7 @@ config ARCH_IMX_V4_V5
 
 config ARCH_IMX_V6_V7
 	bool "i.MX3, i.MX5, i.MX6"
-	depends on !MACH_MULTI_V4_V5
+	depends on !ARCH_MULTI_V4_V5
 	select AUTO_ZRELADDR if !ZBOOT_ROM
 	select ARM_PATCH_PHYS_VIRT
 	select MIGHT_HAVE_CACHE_L2X0
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index c128fac0ce2..60ed6492e7c 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1124,6 +1124,7 @@ config MX1_VIDEO
 config VIDEO_MX1
 	tristate "i.MX1/i.MXL CMOS Sensor Interface driver"
 	depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA
+	depends on BROKEN
 	select FIQ
 	select VIDEOBUF_DMA_CONTIG
 	select MX1_VIDEO
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 6a7e6f1c7a5..f3fa7635c9b 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -41,7 +41,7 @@
 
 #include <asm/dma.h>
 #include <asm/fiq.h>
-#include <mach-imx/dma-mx1-mx2.h>
+#include <mach-imx/dma.h>
 #include <mach-imx/hardware.h>
 #include <mach-imx/irqs.h>
 #include <mach-imx/mx1_camera.h>