diff options
| -rw-r--r-- | arch/arm/mach-mx27/board-mx27lite.h | 12 | ||||
| -rw-r--r-- | arch/arm/mach-mx27/serial.c | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/arch/arm/mach-mx27/board-mx27lite.h b/arch/arm/mach-mx27/board-mx27lite.h index f7ca41d0388d..eef4af87f440 100644 --- a/arch/arm/mach-mx27/board-mx27lite.h +++ b/arch/arm/mach-mx27/board-mx27lite.h @@ -47,15 +47,15 @@ /* UART 1 configuration */ #define UART1_MODE MODE_DCE #define UART1_IR NO_IRDA -#define UART1_ENAB 1 +#define UART1_ENABLED 1 /* UART 2 configuration */ #define UART2_MODE MODE_DCE #define UART2_IR NO_IRDA -#define UART2_ENABLED 1 +#define UART2_ENABLED 0 /* UART 3 configuration */ #define UART3_MODE MODE_DCE -#define UART3_IR IRDA -#define UART3_ENABLED 1 +#define UART3_IR NO_IRDA +#define UART3_ENABLED 0 /* UART 4 configuration */ #define UART4_MODE MODE_DTE #define UART4_IR NO_IRDA @@ -63,11 +63,11 @@ /* UART 5 configuration */ #define UART5_MODE MODE_DTE #define UART5_IR NO_IRDA -#define UART5_ENABLED 1 +#define UART5_ENABLED 0 /* UART 6 configuration */ #define UART6_MODE MODE_DTE #define UART6_IR NO_IRDA -#define UART6_ENABLED 1 +#define UART6_ENABLED 0 #define MXC_LL_UART_PADDR UART1_BASE_ADDR #define MXC_LL_UART_VADDR AIPI_IO_ADDRESS(UART1_BASE_ADDR) diff --git a/arch/arm/mach-mx27/serial.c b/arch/arm/mach-mx27/serial.c index 5eb8855a5eea..00bf092bb898 100644 --- a/arch/arm/mach-mx27/serial.c +++ b/arch/arm/mach-mx27/serial.c @@ -23,7 +23,12 @@ #include <asm/hardware.h> #include <asm/arch/mxc_uart.h> #include "serial.h" + +#ifdef CONFIG_MACH_MX27LITE +#include "board-mx27lite.h" +#else #include "board-mx27ads.h" +#endif #if defined(CONFIG_SERIAL_MXC) || defined(CONFIG_SERIAL_MXC_MODULE) @@ -254,14 +259,25 @@ static struct platform_device mxc_uart_device6 = { static int __init mxc_init_uart(void) { /* Register all the MXC UART platform device structures */ + +if (UART1_ENABLED == 1) platform_device_register(&mxc_uart_device1); + +if (UART2_ENABLED == 1) platform_device_register(&mxc_uart_device2); + +if (UART3_ENABLED == 1) platform_device_register(&mxc_uart_device3); +if (UART4_ENABLED == 1) platform_device_register(&mxc_uart_device4); +if (UART5_ENABLED == 1) platform_device_register(&mxc_uart_device5); + +if (UART6_ENABLED == 1) platform_device_register(&mxc_uart_device6); + return 0; } |