Commit 72bfa211 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mark Brown

ASoC: sun4i: explicitly request exclusive reset control

Commit a53e35db ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. Convert all drivers requesting exclusive resets to the
explicit API call so the temporary transition helpers can be removed.

No functional changes.

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fe49cd98
...@@ -1573,7 +1573,8 @@ static int sun4i_codec_probe(struct platform_device *pdev) ...@@ -1573,7 +1573,8 @@ static int sun4i_codec_probe(struct platform_device *pdev)
} }
if (quirks->has_reset) { if (quirks->has_reset) {
scodec->rst = devm_reset_control_get(&pdev->dev, NULL); scodec->rst = devm_reset_control_get_exclusive(&pdev->dev,
NULL);
if (IS_ERR(scodec->rst)) { if (IS_ERR(scodec->rst)) {
dev_err(&pdev->dev, "Failed to get reset control\n"); dev_err(&pdev->dev, "Failed to get reset control\n");
return PTR_ERR(scodec->rst); return PTR_ERR(scodec->rst);
......
...@@ -716,7 +716,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev) ...@@ -716,7 +716,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
} }
if (quirks->has_reset) { if (quirks->has_reset) {
i2s->rst = devm_reset_control_get(&pdev->dev, NULL); i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
if (IS_ERR(i2s->rst)) { if (IS_ERR(i2s->rst)) {
dev_err(&pdev->dev, "Failed to get reset control\n"); dev_err(&pdev->dev, "Failed to get reset control\n");
return PTR_ERR(i2s->rst); return PTR_ERR(i2s->rst);
......
...@@ -520,7 +520,8 @@ static int sun4i_spdif_probe(struct platform_device *pdev) ...@@ -520,7 +520,8 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);
if (quirks->has_reset) { if (quirks->has_reset) {
host->rst = devm_reset_control_get_optional(&pdev->dev, NULL); host->rst = devm_reset_control_get_optional_exclusive(&pdev->dev,
NULL);
if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) { if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
dev_err(&pdev->dev, "Failed to get reset: %d\n", ret); dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment