Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[pandora-kernel.git] / arch / arm / mach-mx5 / board-mx53_evk.c

diff --git a/arch/arm/mach-mx5/board-mx53_evk.c b/arch/arm/mach-mx5/board-mx53_evk.c
index 8ed316b..7b5735c 100644 (file)
--- a/arch/arm/mach-mx5/board-mx53_evk.c
+++ b/arch/arm/mach-mx5/board-mx53_evk.c
@@ -52,8 +52,6 @@ static iomux_v3_cfg_t mx53_evk_pads[] = {
 
        MX53_PAD_PATA_CS_0__UART3_TXD_MUX,
        MX53_PAD_PATA_CS_1__UART3_RXD_MUX,
-       MX53_PAD_PATA_DA_1__UART3_CTS,
-       MX53_PAD_PATA_DA_2__UART3_RTS,
 
        MX53_PAD_EIM_D16__ECSPI1_SCLK,
        MX53_PAD_EIM_D17__ECSPI1_MISO,
@@ -72,7 +70,7 @@ static inline void mx53_evk_init_uart(void)
 {
        imx53_add_imx_uart(0, NULL);
        imx53_add_imx_uart(1, &mx53_evk_uart_pdata);
-       imx53_add_imx_uart(2, &mx53_evk_uart_pdata);
+       imx53_add_imx_uart(2, NULL);
 }
 
 static const struct imxi2c_platform_data mx53_evk_i2c_data __initconst = {
@@ -137,6 +135,7 @@ static void __init mx53_evk_board_init(void)
        spi_register_board_info(mx53_evk_spi_board_info,
                ARRAY_SIZE(mx53_evk_spi_board_info));
        imx53_add_ecspi(0, &mx53_evk_spi_data);
+       imx53_add_imx2_wdt(0, NULL);
 }
 
 static void __init mx53_evk_timer_init(void)