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
d5dac4a69f
ARM: imx: dynamically register imx-uart devices (imx27)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:57 +02:00
3c5227fd40
ARM: imx: dynamically register imx-uart devices (imx21)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:55 +02:00
d112f4e4e5
ARM: imx: dynamically register imx-uart devices (imx1)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:54 +02:00
7536cf992f
ARM: imx: dynamically register spi_imx devices (imx27)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:49 +02:00
642e466bf4
ARM: imx: dynamically register spi_imx devices (imx21)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:46 +02:00
c69871597d
ARM: imx: dynamically register imx-i2c devices (imx27)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:41 +02:00
2b92084f75
ARM: imx: dynamically register imx-i2c devices (imx21)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:39 +02:00
6348e6b54e
ARM: imx: dynamically register imx-i2c devices (imx1)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:37 +02:00
0e7a29a8d9
ARM: imx: Change the way nand devices are registered (imx27)
...
Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:33 +02:00
1f8d721cd3
ARM: imx: Change the way nand devices are registered (imx21)
...
Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:30 +02:00
074694956b
ARM: imx: move mx1 support to mach-imx
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 08:59:44 +02:00
551823e7e0
ARM: imx: rename mxc_uart_devicex to follow a common naming scheme
...
Addionally remove an unneeded include.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 08:59:43 +02:00
e9ec2a17ee
ARM: imx: fold serial.c into devices.c
...
... and use cpp magic to reduce repetition.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24 15:40:41 +02:00
9a763bfbe4
ARM: imx: get rid of mxc_gpio_init
...
This function is defined once for each imx family and so is in the way
when compiling a kernel for more than one SoC.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24 15:40:40 +02:00
d109167b9c
ARM: imx: rename mach dir for mx21 and mx27 to mach-imx
...
Finally all imx code should end up there, start with mach-mx2. While
touching all files rename some files to use a hyphen instead of an
underscore.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24 15:40:38 +02:00
Uwe Kleine-König