1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 45a25a01c44d..d60e001cf60f 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -43,8 +43,6 @@
 #include <plat/dmtimer.h>
 #include <plat/omap-serial.h>
 
-#define OMAP_UART_AUTOSUSPEND_DELAY -1
-
 static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
 /* Forward declaration of functions */
@@ -1376,8 +1374,8 @@ static int serial_omap_probe(struct platform_device *pdev)
                 up->uart_dma.uart_dma_tx = dma_tx->start;
                 up->uart_dma.uart_dma_rx = dma_rx->start;
                 up->use_dma = 1;
-                up->uart_dma.rx_buf_size = 4096;
-                up->uart_dma.rx_timeout = 2;
+                up->uart_dma.rx_buf_size = omap_up_info->dma_rx_buf_size;
+                up->uart_dma.rx_timeout = omap_up_info->dma_rx_timeout;
                 spin_lock_init(&(up->uart_dma.tx_lock));
                 spin_lock_init(&(up->uart_dma.rx_lock));
                 up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
@@ -1386,7 +1384,7 @@ static int serial_omap_probe(struct platform_device *pdev)
 
         pm_runtime_use_autosuspend(&pdev->dev);
         pm_runtime_set_autosuspend_delay(&pdev->dev,
-                        OMAP_UART_AUTOSUSPEND_DELAY);
+                        omap_up_info->autosuspend_timeout);
 
         pm_runtime_irq_safe(&pdev->dev);
         pm_runtime_enable(&pdev->dev);