mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 09:41:41 +00:00
72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
From 72bfa2117bdb4bb5b07dd5ed833ff3c318fc70b6 Mon Sep 17 00:00:00 2001
|
|
From: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Date: Wed, 19 Jul 2017 17:26:43 +0200
|
|
Subject: ASoC: sun4i: explicitly request exclusive reset control
|
|
|
|
Commit a53e35db70d1 ("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: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/sunxi/sun4i-codec.c | 3 ++-
|
|
sound/soc/sunxi/sun4i-i2s.c | 2 +-
|
|
sound/soc/sunxi/sun4i-spdif.c | 3 ++-
|
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
(limited to 'sound/soc/sunxi')
|
|
|
|
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
|
|
index 4c37231..73d054f 100644
|
|
--- a/sound/soc/sunxi/sun4i-codec.c
|
|
+++ b/sound/soc/sunxi/sun4i-codec.c
|
|
@@ -1573,7 +1573,8 @@ static int sun4i_codec_probe(struct platform_device *pdev)
|
|
}
|
|
|
|
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)) {
|
|
dev_err(&pdev->dev, "Failed to get reset control\n");
|
|
return PTR_ERR(scodec->rst);
|
|
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
|
|
index 3635bbc..62b307b 100644
|
|
--- a/sound/soc/sunxi/sun4i-i2s.c
|
|
+++ b/sound/soc/sunxi/sun4i-i2s.c
|
|
@@ -716,7 +716,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
|
|
}
|
|
|
|
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)) {
|
|
dev_err(&pdev->dev, "Failed to get reset control\n");
|
|
return PTR_ERR(i2s->rst);
|
|
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
|
|
index eaefd07..c49f375 100644
|
|
--- a/sound/soc/sunxi/sun4i-spdif.c
|
|
+++ b/sound/soc/sunxi/sun4i-spdif.c
|
|
@@ -520,7 +520,8 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
|
|
platform_set_drvdata(pdev, host);
|
|
|
|
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) {
|
|
ret = -EPROBE_DEFER;
|
|
dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
|
|
--
|
|
cgit v1.1
|
|
|