|
@@ -862,9 +862,8 @@ static int atmel_prepare_tx_dma(struct uart_port *port)
|
|
config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
|
|
config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
|
|
config.dst_addr = port->mapbase + ATMEL_US_THR;
|
|
config.dst_addr = port->mapbase + ATMEL_US_THR;
|
|
|
|
|
|
- ret = dmaengine_device_control(atmel_port->chan_tx,
|
|
|
|
- DMA_SLAVE_CONFIG,
|
|
|
|
- (unsigned long)&config);
|
|
|
|
|
|
+ ret = dmaengine_slave_config(atmel_port->chan_tx,
|
|
|
|
+ &config);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(port->dev, "DMA tx slave configuration failed\n");
|
|
dev_err(port->dev, "DMA tx slave configuration failed\n");
|
|
goto chan_err;
|
|
goto chan_err;
|
|
@@ -1042,9 +1041,8 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
|
|
config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
|
|
config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
|
|
config.src_addr = port->mapbase + ATMEL_US_RHR;
|
|
config.src_addr = port->mapbase + ATMEL_US_RHR;
|
|
|
|
|
|
- ret = dmaengine_device_control(atmel_port->chan_rx,
|
|
|
|
- DMA_SLAVE_CONFIG,
|
|
|
|
- (unsigned long)&config);
|
|
|
|
|
|
+ ret = dmaengine_slave_config(atmel_port->chan_rx,
|
|
|
|
+ &config);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(port->dev, "DMA rx slave configuration failed\n");
|
|
dev_err(port->dev, "DMA rx slave configuration failed\n");
|
|
goto chan_err;
|
|
goto chan_err;
|