diff options
Diffstat (limited to 'arch/arm/mach-imx/devices.c')
-rw-r--r-- | arch/arm/mach-imx/devices.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c index 08ae763d9db0..b37280561a3f 100644 --- a/arch/arm/mach-imx/devices.c +++ b/arch/arm/mach-imx/devices.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <mach/hardware.h> | 38 | #include <mach/hardware.h> |
39 | #include <mach/common.h> | 39 | #include <mach/common.h> |
40 | #include <mach/mmc.h> | 40 | #include <mach/mmc.h> |
41 | #include <mach/imx-uart.h> | ||
42 | 41 | ||
43 | #include "devices.h" | 42 | #include "devices.h" |
44 | 43 | ||
@@ -426,7 +425,7 @@ struct platform_device mxc_usbh2 = { | |||
426 | DEFINE_IMX_SSI_DEVICE(0, 1, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); | 425 | DEFINE_IMX_SSI_DEVICE(0, 1, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); |
427 | DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); | 426 | DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); |
428 | 427 | ||
429 | #define DEFINE_IMX_UART_DEVICE(n, baseaddr, irq) \ | 428 | #define DEFINE_IMX2x_UART_DEVICE(n, baseaddr, irq) \ |
430 | static struct resource imx2x_uart_resources ## n[] = { \ | 429 | static struct resource imx2x_uart_resources ## n[] = { \ |
431 | { \ | 430 | { \ |
432 | .start = baseaddr, \ | 431 | .start = baseaddr, \ |
@@ -439,21 +438,21 @@ DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); | |||
439 | }, \ | 438 | }, \ |
440 | }; \ | 439 | }; \ |
441 | \ | 440 | \ |
442 | struct platform_device mxc_uart_device ## n = { \ | 441 | struct platform_device imx2x_uart_device ## n = { \ |
443 | .name = "imx-uart", \ | 442 | .name = "imx-uart", \ |
444 | .id = n, \ | 443 | .id = n, \ |
445 | .num_resources = ARRAY_SIZE(imx2x_uart_resources ## n), \ | 444 | .num_resources = ARRAY_SIZE(imx2x_uart_resources ## n), \ |
446 | .resource = imx2x_uart_resources ## n, \ | 445 | .resource = imx2x_uart_resources ## n, \ |
447 | } | 446 | } |
448 | 447 | ||
449 | DEFINE_IMX_UART_DEVICE(0, MX2x_UART1_BASE_ADDR, MX2x_INT_UART1); | 448 | DEFINE_IMX2x_UART_DEVICE(0, MX2x_UART1_BASE_ADDR, MX2x_INT_UART1); |
450 | DEFINE_IMX_UART_DEVICE(1, MX2x_UART2_BASE_ADDR, MX2x_INT_UART2); | 449 | DEFINE_IMX2x_UART_DEVICE(1, MX2x_UART2_BASE_ADDR, MX2x_INT_UART2); |
451 | DEFINE_IMX_UART_DEVICE(2, MX2x_UART3_BASE_ADDR, MX2x_INT_UART3); | 450 | DEFINE_IMX2x_UART_DEVICE(2, MX2x_UART3_BASE_ADDR, MX2x_INT_UART3); |
452 | DEFINE_IMX_UART_DEVICE(3, MX2x_UART4_BASE_ADDR, MX2x_INT_UART4); | 451 | DEFINE_IMX2x_UART_DEVICE(3, MX2x_UART4_BASE_ADDR, MX2x_INT_UART4); |
453 | 452 | ||
454 | #ifdef CONFIG_MACH_MX27 | 453 | #ifdef CONFIG_MACH_MX27 |
455 | DEFINE_IMX_UART_DEVICE(4, MX27_UART5_BASE_ADDR, MX27_INT_UART5); | 454 | DEFINE_IMX2x_UART_DEVICE(4, MX27_UART5_BASE_ADDR, MX27_INT_UART5); |
456 | DEFINE_IMX_UART_DEVICE(5, MX27_UART6_BASE_ADDR, MX27_INT_UART6); | 455 | DEFINE_IMX2x_UART_DEVICE(5, MX27_UART6_BASE_ADDR, MX27_INT_UART6); |
457 | #endif | 456 | #endif |
458 | 457 | ||
459 | /* GPIO port description */ | 458 | /* GPIO port description */ |