summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-qong.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-23 11:46:16 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-30 09:00:58 +0200
commit16cf5c41514fd94ff1e8b6be091e4b4732688fa6 (patch)
treeb6c14199c6bac7a174c22a3d05eb48689a81df47 /arch/arm/mach-mx3/mach-qong.c
parentd5dac4a69fe571ec12d999174e0425f2641325d4 (diff)
downloadop-kernel-dev-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.zip
op-kernel-dev-16cf5c41514fd94ff1e8b6be091e4b4732688fa6.tar.gz
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/mach-qong.c')
-rw-r--r--arch/arm/mach-mx3/mach-qong.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
index 335b0bf..d44ac70 100644
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-mx3/mach-qong.c
@@ -30,8 +30,9 @@
#include <mach/common.h>
#include <asm/page.h>
#include <asm/setup.h>
-#include <mach/imx-uart.h>
#include <mach/iomux-mx3.h>
+
+#include "devices-imx31.h"
#include "devices.h"
/* FPGA defines */
@@ -57,7 +58,7 @@
* This file contains the board-specific initialization routines.
*/
-static struct imxuart_platform_data uart_pdata = {
+static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
@@ -68,11 +69,11 @@ static int uart_pins[] = {
MX31_PIN_RXD1__RXD1
};
-static inline void mxc_init_imx_uart(void)
+static inline void __init mxc_init_imx_uart(void)
{
mxc_iomux_setup_multiple_pins(uart_pins, ARRAY_SIZE(uart_pins),
"uart-0");
- mxc_register_device(&mxc_uart_device0, &uart_pdata);
+ imx31_add_imx_uart0(&uart_pdata);
}
static struct resource dnet_resources[] = {
OpenPOWER on IntegriCloud