---

yaml --- r: 187568 b: refs/heads/master c: 5c17ef8 h: refs/heads/master v: v3
git-mirror · Feb 4, 2010 · 5b86260 · 5b86260
1 parent eece698
commit 5b86260
Show file tree

Hide file tree

Showing 61 changed files with 1,893 additions and 1,930 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bac3fcfad565c9bbceeed8b607f140c29df97355
+refs/heads/master: 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -308,9 +308,10 @@ config ARCH_MXC
 	bool "Freescale MXC/iMX-based"
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
+	select ARCH_MTD_XIP
+	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_CLK
-	select COMMON_CLKDEV
 	help
 	  Support for Freescale MXC/iMX-based family of processors
 

diff --git a/trunk/arch/arm/mach-mx1/Makefile b/trunk/arch/arm/mach-mx1/Makefile
@@ -4,7 +4,6 @@
 
 # Object file lists.
 
-EXTRA_CFLAGS += -DIMX_NEEDS_DEPRECATED_SYMBOLS
 obj-y			+= generic.o clock.o devices.o
 
 # Support for CMOS sensor interface

diff --git a/trunk/arch/arm/mach-mx1/mach-mx1ads.c b/trunk/arch/arm/mach-mx1/mach-mx1ads.c
@@ -27,7 +27,7 @@
 #include <mach/hardware.h>
 #include <mach/i2c.h>
 #include <mach/imx-uart.h>
-#include <mach/iomux-mx1.h>
+#include <mach/iomux.h>
 #include <mach/irqs.h>
 
 #include "devices.h"
@@ -147,7 +147,7 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS")
 	/* Maintainer: Sascha Hauer, Pengutronix */
 	.phys_io	= IMX_IO_PHYS,
 	.io_pg_offst	= (IMX_IO_BASE >> 18) & 0xfffc,
-	.boot_params	= MX1_PHYS_OFFSET + 0x100,
+	.boot_params	= PHYS_OFFSET + 0x100,
 	.map_io		= mx1_map_io,
 	.init_irq	= mx1_init_irq,
 	.timer		= &mx1ads_timer,
@@ -157,7 +157,7 @@ MACHINE_END
 MACHINE_START(MXLADS, "Freescale MXLADS")
 	.phys_io	= IMX_IO_PHYS,
 	.io_pg_offst	= (IMX_IO_BASE >> 18) & 0xfffc,
-	.boot_params	= MX1_PHYS_OFFSET + 0x100,
+	.boot_params	= PHYS_OFFSET + 0x100,
 	.map_io		= mx1_map_io,
 	.init_irq	= mx1_init_irq,
 	.timer		= &mx1ads_timer,

diff --git a/trunk/arch/arm/mach-mx1/mach-scb9328.c b/trunk/arch/arm/mach-mx1/mach-scb9328.c
@@ -23,7 +23,7 @@
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/imx-uart.h>
-#include <mach/iomux-mx1.h>
+#include <mach/iomux.h>
 
 #include "devices.h"
 

diff --git a/trunk/arch/arm/mach-mx2/Makefile b/trunk/arch/arm/mach-mx2/Makefile
@@ -4,12 +4,15 @@
 
 # Object file lists.
 
-obj-y	:=  devices.o serial.o
+obj-y	:=  generic.o devices.o serial.o
+CFLAGS_generic.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
+CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
+CFLAGS_serial.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
 
-obj-$(CONFIG_MACH_MX21) += clock_imx21.o mm-imx21.o
+obj-$(CONFIG_MACH_MX21) += clock_imx21.o
 
 obj-$(CONFIG_MACH_MX27) += cpu_imx27.o
-obj-$(CONFIG_MACH_MX27) += clock_imx27.o mm-imx27.o
+obj-$(CONFIG_MACH_MX27) += clock_imx27.o
 
 obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
 obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o