diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2014-08-19 21:29:15 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-09-11 10:18:13 +0400 |
| commit | 8950052029874a6738552debb45077c596e90e6b (patch) | |
| tree | 083a3e015b95ec9415f9ff99638935c9cf5481c9 /drivers/dma/dw/platform.c | |
| parent | 7e1e2f27c5508518e58e5cbb11e26cbb815f4c56 (diff) | |
| download | linux-8950052029874a6738552debb45077c596e90e6b.tar.xz | |
dmaengine: dw: apply both HS interfaces and remove slave_id usage
Instead of one request line member let's use both source and destination ones.
Usually we have no such hardware except Atmel MMC controller found on AVR32
platform (see arch/avr32/mach-at32ap/at32ap700x.c and
drivers/mmc/host/atmel-mci.c).
This patch removes slave_id usage since it'll be removed from the generic
structure in later. This breaks the non-ACPI / non-DT cases for the users of
the driver, i.e. SPI and HSUART. However, these cases mean only PCI enumerated
devices for now, which is anyway broken (considering more than one DMA
controller in the system) and this patch series is intended to fix that
eventually.
The ACPI and DT cases shall be aware of the channel direction when setting
request lines, but this is a minor problem that would be addressed in future.
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dw/platform.c')
| -rw-r--r-- | drivers/dma/dw/platform.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c index c5b339af6be5..7aa3cd33fdec 100644 --- a/drivers/dma/dw/platform.c +++ b/drivers/dma/dw/platform.c @@ -41,7 +41,8 @@ static bool dw_dma_of_filter(struct dma_chan *chan, void *param) if (chan->device != &fargs->dw->dma) return false; - dwc->request_line = fargs->req; + dwc->src_id = fargs->req; + dwc->dst_id = fargs->req; dwc->src_master = fargs->src; dwc->dst_master = fargs->dst; @@ -86,7 +87,8 @@ static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param) chan->chan_id != dma_spec->chan_id) return false; - dwc->request_line = dma_spec->slave_id; + dwc->src_id = dma_spec->slave_id; + dwc->dst_id = dma_spec->slave_id; dwc->src_master = dwc_get_sms(NULL); dwc->dst_master = dwc_get_dms(NULL); |