4d5fe0a362
Move kernel config and patches to kernel 6.6. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From d980004e349049a3fcbffc6096d14896f6a122ed Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
|
|
Date: Tue, 25 Oct 2022 14:41:30 +0200
|
|
Subject: [PATCH] ASoC: rockchip: i2s_tdm: Make the grf property optional
|
|
|
|
Only IO Multiplex and two TRCM modes need access to the GRF, so
|
|
making it a hard requirement is not a wise idea, as it complicates
|
|
support for newer SoCs which do not do these things.
|
|
|
|
Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
|
|
Link: https://lore.kernel.org/r/20221025124132.399729-3-frattaroli.nicolas@gmail.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/rockchip/rockchip_i2s_tdm.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
|
|
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
|
|
@@ -756,6 +756,12 @@ static int rockchip_i2s_io_multiplex(str
|
|
if (!i2s_tdm->io_multiplex)
|
|
return 0;
|
|
|
|
+ if (IS_ERR_OR_NULL(i2s_tdm->grf)) {
|
|
+ dev_err(i2s_tdm->dev,
|
|
+ "io multiplex not supported for this device\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
|
|
struct snd_pcm_str *playback_str =
|
|
&substream->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK];
|
|
@@ -1222,6 +1228,12 @@ static int common_soc_init(struct device
|
|
if (trcm == TRCM_TXRX)
|
|
return 0;
|
|
|
|
+ if (IS_ERR_OR_NULL(i2s_tdm->grf)) {
|
|
+ dev_err(i2s_tdm->dev,
|
|
+ "no grf present but non-txrx TRCM specified\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
for (i = 0; i < i2s_tdm->soc_data->config_count; i++) {
|
|
if (addr != configs[i].addr)
|
|
continue;
|
|
@@ -1568,10 +1580,6 @@ static int rockchip_i2s_tdm_probe(struct
|
|
return ret;
|
|
|
|
i2s_tdm->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf");
|
|
- if (IS_ERR(i2s_tdm->grf))
|
|
- return dev_err_probe(i2s_tdm->dev, PTR_ERR(i2s_tdm->grf),
|
|
- "Error in rockchip,grf\n");
|
|
-
|
|
i2s_tdm->tx_reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
|
|
"tx-m");
|
|
if (IS_ERR(i2s_tdm->tx_reset)) {
|