diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-02-21 21:13:57 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-02-21 21:13:57 +0530 |
| commit | e4e48c47d15df1dd5f74d3b5e8fc4c7817f45133 (patch) | |
| tree | 6eec89260467cb62b721550575bcda2acff68b75 /drivers/dma/dw/pci.c | |
| parent | b802c8410ca915e7772e738e68420115f1a3c811 (diff) | |
| parent | f7c799e950f96191a16f18606e43e6f861b2a361 (diff) | |
Merge branch 'topic/intel' into for-linus
Diffstat (limited to 'drivers/dma/dw/pci.c')
| -rw-r--r-- | drivers/dma/dw/pci.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c index 0ae6c3b1d34e..7778ed705a1a 100644 --- a/drivers/dma/dw/pci.c +++ b/drivers/dma/dw/pci.c @@ -15,6 +15,18 @@ #include "internal.h" +static struct dw_dma_platform_data mrfld_pdata = { + .nr_channels = 8, + .is_private = true, + .is_memcpy = true, + .is_idma32 = true, + .chan_allocation_order = CHAN_ALLOCATION_ASCENDING, + .chan_priority = CHAN_PRIORITY_ASCENDING, + .block_size = 131071, + .nr_masters = 1, + .data_width = {4}, +}; + static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) { const struct dw_dma_platform_data *pdata = (void *)pid->driver_data; @@ -47,6 +59,7 @@ static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) return -ENOMEM; chip->dev = &pdev->dev; + chip->id = pdev->devfn; chip->regs = pcim_iomap_table(pdev)[0]; chip->irq = pdev->irq; chip->pdata = pdata; @@ -95,14 +108,16 @@ static const struct dev_pm_ops dw_pci_dev_pm_ops = { }; static const struct pci_device_id dw_pci_id_table[] = { - /* Medfield */ + /* Medfield (GPDMA) */ { PCI_VDEVICE(INTEL, 0x0827) }, - { PCI_VDEVICE(INTEL, 0x0830) }, /* BayTrail */ { PCI_VDEVICE(INTEL, 0x0f06) }, { PCI_VDEVICE(INTEL, 0x0f40) }, + /* Merrifield iDMA 32-bit (GPDMA) */ + { PCI_VDEVICE(INTEL, 0x11a2), (kernel_ulong_t)&mrfld_pdata }, + /* Braswell */ { PCI_VDEVICE(INTEL, 0x2286) }, { PCI_VDEVICE(INTEL, 0x22c0) }, |