From: "Martin Povišer" <povik+lin@cutebit.org>
To: Hector Martin <marcan@marcan.st>, Sven Peter <sven@svenpeter.dev>,
Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: "Alyssa Rosenzweig" <alyssa@rosenzweig.io>,
asahi@lists.linux.dev, dmaengine@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
"Martin Povišer" <povik+lin@cutebit.org>
Subject: [PATCH 4/4] dmaengine: apple-admac: Trigger shared reset
Date: Sun, 18 Sep 2022 11:58:45 +0200 [thread overview]
Message-ID: <20220918095845.68860-5-povik+lin@cutebit.org> (raw)
In-Reply-To: <20220918095845.68860-1-povik+lin@cutebit.org>
If a reset domain is attached to the device, obtain a shared reference
to it and trigger it. Typically on a chip the ADMAC controller will
share a reset domain with the MCA peripheral.
Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
---
drivers/dma/apple-admac.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c
index 7d1b76678032..317ca76ccafd 100644
--- a/drivers/dma/apple-admac.c
+++ b/drivers/dma/apple-admac.c
@@ -12,8 +12,9 @@
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of_dma.h>
-#include <linux/interrupt.h>
+#include <linux/reset.h>
#include <linux/spinlock.h>
+#include <linux/interrupt.h>
#include "dmaengine.h"
@@ -95,6 +96,7 @@ struct admac_data {
struct dma_device dma;
struct device *dev;
__iomem void *base;
+ struct reset_control *rstc;
int irq;
int irq_index;
@@ -732,6 +734,10 @@ static int admac_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(ad->base),
"unable to obtain MMIO resource\n");
+ ad->rstc = devm_reset_control_get_optional_shared(&pdev->dev, NULL);
+ if (IS_ERR(ad->rstc))
+ return PTR_ERR(ad->rstc);
+
dma = &ad->dma;
dma_cap_set(DMA_PRIVATE, dma->cap_mask);
@@ -770,10 +776,17 @@ static int admac_probe(struct platform_device *pdev)
tasklet_setup(&adchan->tasklet, admac_chan_tasklet);
}
- err = request_irq(irq, admac_interrupt, 0, dev_name(&pdev->dev), ad);
+ err = reset_control_reset(ad->rstc);
if (err)
return dev_err_probe(&pdev->dev, err,
- "unable to register interrupt\n");
+ "unable to trigger reset\n");
+
+ err = request_irq(irq, admac_interrupt, 0, dev_name(&pdev->dev), ad);
+ if (err) {
+ dev_err_probe(&pdev->dev, err,
+ "unable to register interrupt\n");
+ goto free_reset;
+ }
err = dma_async_device_register(&ad->dma);
if (err) {
@@ -792,6 +805,8 @@ static int admac_probe(struct platform_device *pdev)
free_irq:
free_irq(ad->irq, ad);
+free_reset:
+ reset_control_rearm(ad->rstc);
return err;
}
@@ -802,6 +817,7 @@ static int admac_remove(struct platform_device *pdev)
of_dma_controller_free(pdev->dev.of_node);
dma_async_device_unregister(&ad->dma);
free_irq(ad->irq, ad);
+ reset_control_rearm(ad->rstc);
return 0;
}
--
2.33.0
next prev parent reply other threads:[~2022-09-18 9:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-18 9:58 [PATCH 0/4] Apple ADMAC peripheral reset clean-up Martin Povišer
2022-09-18 9:58 ` [PATCH 1/4] dt-bindings: dma: apple,admac: Add reset Martin Povišer
2022-09-18 10:00 ` Krzysztof Kozlowski
2022-09-18 9:58 ` [PATCH 2/4] arm64: dts: apple: Add ADMAC resets on t8103/t600x Martin Povišer
2022-09-18 9:58 ` [PATCH 3/4] dmaengine: apple-admac: Do not use devres for IRQs Martin Povišer
2022-09-29 16:14 ` Vinod Koul
2022-09-18 9:58 ` Martin Povišer [this message]
2022-09-30 9:01 ` [PATCH 4/4] dmaengine: apple-admac: Trigger shared reset Philipp Zabel
2022-09-22 13:44 ` [PATCH 0/4] Apple ADMAC peripheral reset clean-up Hector Martin
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=20220918095845.68860-5-povik+lin@cutebit.org \
--to=povik+lin@cutebit.org \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=sven@svenpeter.dev \
--cc=vkoul@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).