summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mx31moboard-smartbot.c
diff options
context:
space:
mode:
authorUwe Kleine-König2010-06-23 11:46:16 +0200
committerUwe Kleine-König2010-06-30 09:00:58 +0200
commit16cf5c41514fd94ff1e8b6be091e4b4732688fa6 (patch)
treeb6c14199c6bac7a174c22a3d05eb48689a81df47 /arch/arm/mach-mx3/mx31moboard-smartbot.c
parentARM: imx: dynamically register imx-uart devices (imx27) (diff)
downloadkernel-qcow2-linux-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.tar.gz
kernel-qcow2-linux-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.tar.xz
kernel-qcow2-linux-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.zip
ARM: imx: dynamically register imx-uart devices (imx31)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-smartbot.c')
-rw-r--r--arch/arm/mach-mx3/mx31moboard-smartbot.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-mx3/mx31moboard-smartbot.c
index f45a500a4816..40c3e7564cb6 100644
--- a/arch/arm/mach-mx3/mx31moboard-smartbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c
@@ -26,7 +26,6 @@
#include <mach/common.h>
#include <mach/hardware.h>
-#include <mach/imx-uart.h>
#include <mach/iomux-mx3.h>
#include <mach/board-mx31moboard.h>
#include <mach/mxc_ehci.h>
@@ -34,6 +33,7 @@
#include <media/soc_camera.h>
+#include "devices-imx31.h"
#include "devices.h"
static unsigned int smartbot_pins[] = {
@@ -55,7 +55,7 @@ static unsigned int smartbot_pins[] = {
MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11,
};
-static struct imxuart_platform_data uart_pdata = {
+static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
@@ -179,8 +179,7 @@ void __init mx31moboard_smartbot_init(int board)
mxc_iomux_setup_multiple_pins(smartbot_pins, ARRAY_SIZE(smartbot_pins),
"smartbot");
- mxc_register_device(&mxc_uart_device1, &uart_pdata);
-
+ imx31_add_imx_uart1(&uart_pdata);
switch (board) {
case MX31SMARTBOT: