| Message ID | 20220927113426.49724-1-povik+lin@cutebit.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d584e73e7310971cc226ef0e2a1bc0526da0d582 |
| Headers | show |
| Series | [1/3] ASoC: apple: mca: Trigger, not deassert, the peripheral reset | expand |
On Tue, 27 Sep 2022 13:34:24 +0200, Martin Povišer wrote: > 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. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/3] ASoC: apple: mca: Trigger, not deassert, the peripheral reset commit: d584e73e7310971cc226ef0e2a1bc0526da0d582 [2/3] ASoC: apple: mca: Remove stale release of DMA channels commit: e92e50e4263f5cf9c731ef5593c31f94dc3b7b8c [3/3] ASoC: apple: mca: Adjust timing of component unregister commit: db6ae79a7e4f729457ec42db5d6d0fbe0e35784c All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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];
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> --- Cc: Philipp Zabel <p.zabel@pengutronix.de> sound/soc/apple/mca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)