From b5906344a4fc594832005e32e14ac54b0e3cc545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik+lin@cutebit.org>
Date: Fri, 16 Sep 2022 12:03:24 +0200
Subject: [PATCH] ASoC: apple: mca: Trigger, not deassert, the peripheral reset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Replace the deassertion of the peripheral's shared reset with the
triggering of a pulse on it. This is what we should have been using all
along as the platform's custom is not leaving the reset asserted on
unused peripherals.
Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver")
Signed-off-by: Martin PoviĊĦer <povik+lin@cutebit.org>
---
sound/soc/apple/mca.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c
index 69643524796e..75925bfcf754 100644
--- a/sound/soc/apple/mca.c
+++ b/sound/soc/apple/mca.c
@@ -995,7 +995,7 @@ static void apple_mca_release(struct mca_data *mca)
if (!IS_ERR_OR_NULL(mca->pd_dev))
dev_pm_domain_detach(mca->pd_dev, true);
- reset_control_assert(mca->rstc);
+ reset_control_rearm(mca->rstc);
}
static int apple_mca_probe(struct platform_device *pdev)
@@ -1049,12 +1049,12 @@ static int apple_mca_probe(struct platform_device *pdev)
DL_FLAG_RPM_ACTIVE);
if (!mca->pd_link) {
ret = -EINVAL;
- /* Prevent an unbalanced reset assert */
+ /* Prevent an unbalanced reset rearm */
mca->rstc = NULL;
goto err_release;
}
- reset_control_deassert(mca->rstc);
+ reset_control_reset(mca->rstc);
for (i = 0; i < nclusters; i++) {
struct mca_cluster *cl = &clusters[i];
--
2.32.0 (Apple Git-132)