From: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com>
To: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: CARLOS.PALMINHA@synopsys.com,
"Ramiro Oliveira" <Ramiro.Oliveira@synopsys.com>,
"Dan Williams" <dan.j.williams@intel.com>,
"Kedareswara rao Appana" <appana.durga.rao@xilinx.com>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Michal Simek" <michal.simek@xilinx.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Sören Brinkmann" <soren.brinkmann@xilinx.com>,
"Vinod Koul" <vinod.koul@intel.com>
Subject: [PATCH v2 2/2] dma: xilinx: Add reset support
Date: Mon, 6 Mar 2017 12:17:39 +0000 [thread overview]
Message-ID: <f7e00cde86aebcc5a0e85ea67ec96f27544acc82.1488801913.git.roliveir@synopsys.com> (raw)
In-Reply-To: <cover.1488801913.git.roliveir@synopsys.com>
In-Reply-To: <cover.1488801913.git.roliveir@synopsys.com>
Add a DT property to control an optional external reset line
Signed-off-by: Ramiro Oliveira <roliveir@synopsys.com>
---
drivers/dma/xilinx/xilinx_dma.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 5c9f11b623ca..589cbb611bc8 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -32,20 +32,21 @@
*/
#include <linux/bitops.h>
-#include <linux/dmapool.h>
+#include <linux/clk.h>
#include <linux/dma/xilinx_dma.h>
+#include <linux/dmapool.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/of_dma.h>
-#include <linux/of_platform.h>
#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/reset.h>
#include <linux/slab.h>
-#include <linux/clk.h>
-#include <linux/io-64-nonatomic-lo-hi.h>
#include "../dmaengine.h"
@@ -409,6 +410,7 @@ struct xilinx_dma_device {
struct clk *rxs_clk;
u32 nr_channels;
u32 chan_id;
+ struct reset_control *rst;
};
/* Macros */
@@ -2543,6 +2545,20 @@ static int xilinx_dma_probe(struct platform_device *pdev)
if (IS_ERR(xdev->regs))
return PTR_ERR(xdev->regs);
+ xdev->rst = devm_reset_control_get_optional_shared(&pdev->dev, NULL);
+ if (IS_ERR(xdev->rst)) {
+ err = PTR_ERR(xdev->rst);
+ if (err == -EPROBE_DEFER)
+ return err;
+ xdev->rst = NULL;
+ } else {
+ err = reset_control_deassert(xdev->rst);
+ if (err) {
+ dev_err(xdev->dev, "error deasserting reset %d\n", err);
+ return err;
+ }
+ }
+
/* Retrieve the DMA engine properties from the device tree */
xdev->has_sg = of_property_read_bool(node, "xlnx,include-sg");
if (xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA)
--
2.11.0
next prev parent reply other threads:[~2017-03-06 12:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 12:17 [PATCH v2 0/2] xilinx_dma: Add external reset control Ramiro Oliveira
2017-03-06 12:17 ` [PATCH v2 1/2] dma: xilinx: Edit device tree bindings documentation Ramiro Oliveira
2017-03-15 16:47 ` Rob Herring
2017-03-06 12:17 ` Ramiro Oliveira [this message]
2017-03-14 3:38 ` [PATCH v2 2/2] dma: xilinx: Add reset support Vinod Koul
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=f7e00cde86aebcc5a0e85ea67ec96f27544acc82.1488801913.git.roliveir@synopsys.com \
--to=ramiro.oliveira@synopsys.com \
--cc=CARLOS.PALMINHA@synopsys.com \
--cc=appana.durga.rao@xilinx.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=robh+dt@kernel.org \
--cc=soren.brinkmann@xilinx.com \
--cc=vinod.koul@intel.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
all inboxes | Powered by JetHome®