Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933554AbcLNRTE (ORCPT ); Wed, 14 Dec 2016 12:19:04 -0500 Received: from smtprelay.synopsys.com ([198.182.47.9]:48468 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933089AbcLNRTC (ORCPT ); Wed, 14 Dec 2016 12:19:02 -0500 From: Ramiro Oliveira To: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: vinod.koul@intel.com, robh+dt@kernel.org, mark.rutland@arm.com, michal.simek@xilinx.com, soren.brinkmann@xilinx.com, appana.durga.rao@xilinx.com, anuragku@xilinx.com, dan.j.williams@intel.com, laurent.pinchart@ideasonboard.com, CARLOS.PALMINHA@synopsys.com, Ramiro Oliveira Subject: [PATCH 2/2] xilinx_dma: Add reset support Date: Wed, 14 Dec 2016 17:18:24 +0000 Message-Id: <4220c66c29d83bec1ded798ee383b5460c162cfc.1481735244.git.roliveir@synopsys.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1520 Lines: 58 Add a DT property to control an optional external reset line Signed-off-by: Ramiro Oliveira --- drivers/dma/xilinx/xilinx_dma.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 5c9f11b..b845224 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -46,6 +46,7 @@ #include #include #include +#include #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,27 @@ 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(&pdev->dev, "reset"); + if (IS_ERR(xdev->rst)) { + err = PTR_ERR(xdev->rst); + switch (err) { + case -ENOENT: + case -ENOTSUPP: + xdev->rst = NULL; + break; + default: + dev_err(xdev->dev, "error getting reset %d\n", err); + return err; + } + } else { + err = reset_control_deassert(xdev->rst); + if (err) { + dev_err(xdev->dev, "failed to deassert 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.10.2