Russell King
d50f58bbd9
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
2010-07-29 15:48:37 +01:00
Uwe Kleine-König
2dcf78c0ee
Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD
...
There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/devices.c
arch/arm/mach-imx/devices.h
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
arch/arm/mach-mx2/Kconfig
arch/arm/mach-mx25/Makefile
arch/arm/mach-mx25/devices.c
arch/arm/plat-mxc/include/mach/mx25.h
arch/arm/plat-mxc/include/mach/mxc_nand.h
2010-07-26 14:27:25 +02:00
Daniel Mack
21b0734476
ARM: mx3: mx31lilly: pass mc13783 SPI IRQ pin
...
This makes the resistive touch interface work.
Signed-off-by: Daniel Mack <daniel@caiaq.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-07-26 14:17:33 +02:00
Daniel Mack
4d5d85906a
ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI
...
arch/arm/mach-mx3/built-in.o: In function `mx31lilly_board_init':
mach-kzm_arm11_01.c:(.init.text+0x674): undefined reference to `otg_ulpi_create'
mach-kzm_arm11_01.c:(.init.text+0x68c): undefined reference to `otg_ulpi_create'
mach-kzm_arm11_01.c:(.init.text+0x744): undefined reference to `mxc_ulpi_access_ops'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Daniel Mack <daniel@caiaq.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-07-01 09:52:39 +02:00
Uwe Kleine-König
06606ff130
ARM: imx: dynamically register spi_imx devices (imx31)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
2010-06-30 09:00:50 +02:00
Uwe Kleine-König
d694eea529
ARM: mx3: remove paragraphs with old address of the FSF
...
As the kernel contains a copy of the GPL anyhow just get rid of the address
specification instead of fixing it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
2010-06-30 09:00:26 +02:00
Daniel Mack
066fb84720
ARM: mx3/lilly1131: add USB support
...
Signed-off-by: Daniel Mack <daniel@caiaq.de >
Cc: Sascha Hauer <s.hauer@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-04-14 09:03:03 +02:00
Uwe Kleine-König
34101237d9
imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET
...
This is a further step in allowing to build a kernel image for more
than one imx SOC.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
2010-02-02 09:07:59 +01:00
Uwe Kleine-König
321ed16436
imx/mx3: rename files defining a machine to mach-$mach.c
...
While at it remove some superfluous parenthesis.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Cc: Sascha Hauer <kernel@pengutronix.de >
Cc: Russell King <linux@arm.linux.org.uk >
Cc: Daniel Mack <daniel@caiaq.de >
Cc: Fabio Estevam <fabio.estevam@freescale.com >
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch >
2010-01-08 16:40:51 +01:00
