aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-pca100.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-23 03:36:01 -0400
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-30 03:00:57 -0400
commitd5dac4a69fe571ec12d999174e0425f2641325d4 (patch)
tree05d979412730c14e02c1d4e974d32907cf0f537d /arch/arm/mach-imx/mach-pca100.c
parent7cc3c84666db63995d44b44276d304c6f0c92630 (diff)
ARM: imx: dynamically register imx-uart devices (imx27)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
-rw-r--r--arch/arm/mach-imx/mach-pca100.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 953cc74bb07f..ff3cf1ef31b4 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -37,7 +37,6 @@
37#include <mach/hardware.h> 37#include <mach/hardware.h>
38#include <mach/iomux-mx27.h> 38#include <mach/iomux-mx27.h>
39#include <asm/mach/time.h> 39#include <asm/mach/time.h>
40#include <mach/imx-uart.h>
41#include <mach/audmux.h> 40#include <mach/audmux.h>
42#include <mach/ssi.h> 41#include <mach/ssi.h>
43#include <mach/mxc_nand.h> 42#include <mach/mxc_nand.h>
@@ -130,7 +129,7 @@ static int pca100_pins[] = {
130 PD26_AF_USBH2_DATA5, 129 PD26_AF_USBH2_DATA5,
131}; 130};
132 131
133static struct imxuart_platform_data uart_pdata = { 132static const struct imxuart_platform_data uart_pdata __initconst = {
134 .flags = IMXUART_HAVE_RTSCTS, 133 .flags = IMXUART_HAVE_RTSCTS,
135}; 134};
136 135
@@ -318,7 +317,7 @@ static void __init pca100_init(void)
318 317
319 mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata); 318 mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata);
320 319
321 mxc_register_device(&imx2x_uart_device0, &uart_pdata); 320 imx27_add_imx_uart0(&uart_pdata);
322 321
323 mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN); 322 mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN);
324 mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata); 323 mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata);