|
@@ -1615,9 +1615,9 @@ static bool filter(struct dma_chan *chan, void *slave)
|
|
|
struct sh_dmae_slave *param = slave;
|
|
|
|
|
|
dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,
|
|
|
- param->slave_id);
|
|
|
+ param->shdma_slave.slave_id);
|
|
|
|
|
|
- chan->private = param;
|
|
|
+ chan->private = ¶m->shdma_slave;
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -1656,7 +1656,7 @@ static void sci_request_dma(struct uart_port *port)
|
|
|
param = &s->param_tx;
|
|
|
|
|
|
/* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */
|
|
|
- param->slave_id = s->cfg->dma_slave_tx;
|
|
|
+ param->shdma_slave.slave_id = s->cfg->dma_slave_tx;
|
|
|
|
|
|
s->cookie_tx = -EINVAL;
|
|
|
chan = dma_request_channel(mask, filter, param);
|
|
@@ -1684,7 +1684,7 @@ static void sci_request_dma(struct uart_port *port)
|
|
|
param = &s->param_rx;
|
|
|
|
|
|
/* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */
|
|
|
- param->slave_id = s->cfg->dma_slave_rx;
|
|
|
+ param->shdma_slave.slave_id = s->cfg->dma_slave_rx;
|
|
|
|
|
|
chan = dma_request_channel(mask, filter, param);
|
|
|
dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);
|