From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Viresh Kumar <viresh.linux@gmail.com>,
Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org,
spear-devel <spear-devel@list.st.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCHv3 5/7] dmaengine: dw_dmac: add PCI part of the driver
Date: Thu, 27 Sep 2012 10:31:59 +0300 [thread overview]
Message-ID: <1348731121-2515-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1348731121-2515-1-git-send-email-andriy.shevchenko@linux.intel.com>
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
This is the PCI part of the DesignWare DMAC driver. The controller is usually
used in the Intel hardware such as Medfield.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/Kconfig | 9 ++++
drivers/dma/Makefile | 1 +
drivers/dma/dw_dmac_pci.c | 126 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 136 insertions(+)
create mode 100644 drivers/dma/dw_dmac_pci.c
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index df32537..a5c7f64 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -89,6 +89,15 @@ config DW_DMAC
Support the Synopsys DesignWare AHB DMA controller. This
can be integrated in chips such as the Atmel AT32ap7000.
+config DW_DMAC_PCI
+ tristate "Synopsys DesignWare AHB DMA support (PCI bus)"
+ depends on PCI
+ select DW_DMAC
+ help
+ Support the Synopsys DesignWare AHB DMA controller on the platfroms
+ that provide it as a PCI device. For example, Intel Medfield has
+ integrated this GPDMA controller.
+
config AT_HDMAC
tristate "Atmel AHB DMA support"
depends on ARCH_AT91
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 7428fea..15eef5f 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_FSL_DMA) += fsldma.o
obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o
obj-$(CONFIG_MV_XOR) += mv_xor.o
obj-$(CONFIG_DW_DMAC) += dw_dmac.o
+obj-$(CONFIG_DW_DMAC_PCI) += dw_dmac_pci.o
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
obj-$(CONFIG_MX3_IPU) += ipu/
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
diff --git a/drivers/dma/dw_dmac_pci.c b/drivers/dma/dw_dmac_pci.c
new file mode 100644
index 0000000..b7ad37f
--- /dev/null
+++ b/drivers/dma/dw_dmac_pci.c
@@ -0,0 +1,126 @@
+/*
+ * PCI driver for the Synopsys DesignWare DMA Controller
+ *
+ * Copyright (C) 2012 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/dw_dmac.h>
+
+static struct dw_dma_platform_data pdata = {
+ .is_private = 1,
+ .chan_allocation_order = CHAN_ALLOCATION_ASCENDING,
+ .chan_priority = CHAN_PRIORITY_ASCENDING,
+};
+
+static int __devinit dw_pci_probe(struct pci_dev *pdev,
+ const struct pci_device_id *id)
+{
+ struct platform_device *pd;
+ struct resource r[2];
+ struct dw_dma_platform_data *driver = (void *)id->driver_data;
+ static int instance;
+ int ret;
+
+ ret = pci_enable_device(pdev);
+ if (ret)
+ return ret;
+
+ pci_set_power_state(pdev, PCI_D0);
+ pci_set_master(pdev);
+ pci_try_set_mwi(pdev);
+
+ ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+ if (ret)
+ goto err0;
+
+ ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+ if (ret)
+ goto err0;
+
+ pd = platform_device_alloc("dw_dmac", instance);
+ if (!pd) {
+ dev_err(&pdev->dev, "can't allocate dw_dmac platform device\n");
+ ret = -ENOMEM;
+ goto err0;
+ }
+
+ memset(r, 0, sizeof(r));
+
+ r[0].start = pci_resource_start(pdev, 0);
+ r[0].end = pci_resource_end(pdev, 0);
+ r[0].flags = IORESOURCE_MEM;
+
+ r[1].start = pdev->irq;
+ r[1].flags = IORESOURCE_IRQ;
+
+ ret = platform_device_add_resources(pd, r, ARRAY_SIZE(r));
+ if (ret) {
+ dev_err(&pdev->dev, "can't add resources to platform device\n");
+ goto err1;
+ }
+
+ ret = platform_device_add_data(pd, driver, sizeof(*driver));
+ if (ret)
+ goto err1;
+
+ dma_set_coherent_mask(&pd->dev, pdev->dev.coherent_dma_mask);
+ pd->dev.dma_mask = pdev->dev.dma_mask;
+ pd->dev.dma_parms = pdev->dev.dma_parms;
+ pd->dev.parent = &pdev->dev;
+
+ pci_set_drvdata(pdev, pd);
+
+ ret = platform_device_add(pd);
+ if (ret) {
+ dev_err(&pdev->dev, "platform_device_add failed\n");
+ goto err1;
+ }
+
+ instance++;
+ return 0;
+
+err1:
+ platform_device_put(pd);
+err0:
+ pci_disable_device(pdev);
+
+ return ret;
+}
+
+static void __devexit dw_pci_remove(struct pci_dev *pdev)
+{
+ struct platform_device *pd = pci_get_drvdata(pdev);
+
+ platform_device_unregister(pd);
+ pci_set_drvdata(pdev, NULL);
+ pci_disable_device(pdev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(dw_pci_id_table) = {
+ { PCI_VDEVICE(INTEL, 0x0827), (kernel_ulong_t)&pdata },
+ { PCI_VDEVICE(INTEL, 0x0830), (kernel_ulong_t)&pdata },
+ { PCI_VDEVICE(INTEL, 0x0f06), (kernel_ulong_t)&pdata },
+ { 0, }
+};
+MODULE_DEVICE_TABLE(pci, dw_pci_id_table);
+
+static struct pci_driver dw_pci_driver = {
+ .name = "dw_dmac_pci",
+ .id_table = dw_pci_id_table,
+ .probe = dw_pci_probe,
+ .remove = __devexit_p(dw_pci_remove),
+};
+
+module_pci_driver(dw_pci_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("DesignWare DMAC PCI driver");
+MODULE_AUTHOR("Heikki Krogerus <heikki.krogerus@linux.intel.com>");
+MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
--
1.7.10.4
next prev parent reply other threads:[~2012-09-27 7:32 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-27 7:31 [PATCHv3 0/7] dw_dmac: split the driver and introduce PCI part Andy Shevchenko
2012-09-27 7:31 ` [PATCHv3 1/7] dmaengine: dw_dmac: use helper macro module_platform_driver() Andy Shevchenko
2012-09-27 7:40 ` Felipe Balbi
2012-09-27 8:16 ` viresh kumar
2012-09-27 8:16 ` Felipe Balbi
2012-10-01 10:47 ` Andy Shevchenko
2012-10-01 13:05 ` Felipe Balbi
2012-09-27 7:31 ` [PATCHv3 2/7] dmaengine: dw_dmac: add module alias Andy Shevchenko
2012-09-27 8:16 ` viresh kumar
2012-09-27 8:16 ` Felipe Balbi
2012-09-27 7:31 ` [PATCHv3 3/7] dmaengine: dw_dmac: remove CLK dependency Andy Shevchenko
2012-09-27 7:42 ` Felipe Balbi
2012-09-27 8:04 ` Andy Shevchenko
2012-09-27 8:02 ` Felipe Balbi
2012-09-27 8:17 ` viresh kumar
2012-09-27 8:17 ` Felipe Balbi
2012-09-27 7:31 ` [PATCHv3 4/7] dmaengine: dw_dmac: amend description and indentation Andy Shevchenko
2012-09-27 7:45 ` Felipe Balbi
2012-09-27 8:19 ` viresh kumar
2012-09-27 8:36 ` Andy Shevchenko
2012-09-27 7:31 ` Andy Shevchenko [this message]
2012-09-27 7:49 ` [PATCHv3 5/7] dmaengine: dw_dmac: add PCI part of the driver Felipe Balbi
2012-09-27 8:08 ` Andy Shevchenko
2012-09-27 8:09 ` Felipe Balbi
2012-09-27 8:44 ` Vinod Koul
2012-09-27 9:43 ` Andy Shevchenko
2012-09-27 10:01 ` Vinod Koul
2012-09-27 10:11 ` viresh kumar
2012-09-27 10:32 ` Vinod Koul
2012-10-03 13:40 ` Andy Shevchenko
2012-10-08 10:17 ` Andy Shevchenko
2012-10-08 10:49 ` Viresh Kumar
2012-10-08 12:46 ` Andy Shevchenko
2012-10-08 13:27 ` Viresh Kumar
2012-10-24 11:13 ` Vinod Koul
2012-10-30 15:05 ` Andy Shevchenko
2012-10-30 15:19 ` Viresh Kumar
2012-10-30 15:39 ` Andy Shevchenko
2012-09-27 7:32 ` [PATCHv3 6/7] dma: move dw_dmac driver to an own directory Andy Shevchenko
2012-09-27 7:50 ` Felipe Balbi
2012-09-27 8:22 ` viresh kumar
2012-09-27 8:39 ` Felipe Balbi
2012-09-27 7:32 ` [PATCHv3 7/7] MAINTAINERS: add recently created files to dw_dmac section Andy Shevchenko
2012-09-27 7:51 ` Felipe Balbi
2012-09-27 8:12 ` viresh kumar
2012-09-27 8:24 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348731121-2515-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spear-devel@list.st.com \
--cc=vinod.koul@intel.com \
--cc=viresh.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox