Skip to content

Commit cfc9d37

Browse files
ujfalusibroonie
authored andcommitted
ASoC: ti: j721e-evm: Convert the audio domain IDs to enum
Convert the J721E_AUDIO_DOMAIN_* from defines to enum to make it possible to extend the number of domains in the future. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> Link: https://lore.kernel.org/r/20210717122820.1467-4-peter.ujfalusi@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent d9dbe1f commit cfc9d37

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

sound/soc/ti/j721e-evm.c

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
*/
2424
#define J721E_CODEC_CONF_COUNT 5
2525

26-
#define J721E_AUDIO_DOMAIN_CPB 0
27-
#define J721E_AUDIO_DOMAIN_IVI 1
26+
enum j721e_audio_domain_id {
27+
J721E_AUDIO_DOMAIN_CPB = 0,
28+
J721E_AUDIO_DOMAIN_IVI,
29+
J721E_AUDIO_DOMAIN_LAST,
30+
};
2831

2932
#define J721E_CLK_PARENT_48000 0
3033
#define J721E_CLK_PARENT_44100 1
@@ -78,7 +81,7 @@ struct j721e_priv {
7881
u32 pll_rates[2];
7982
unsigned int hsdiv_rates[2];
8083

81-
struct j721e_audio_domain audio_domains[2];
84+
struct j721e_audio_domain audio_domains[J721E_AUDIO_DOMAIN_LAST];
8285

8386
struct mutex mutex;
8487
};
@@ -199,9 +202,8 @@ static int j721e_configure_refclk(struct j721e_priv *priv,
199202

200203
if (priv->hsdiv_rates[domain->parent_clk_id] != scki) {
201204
dev_dbg(priv->dev,
202-
"%s configuration for %u Hz: %s, %dxFS (SCKI: %u Hz)\n",
203-
audio_domain == J721E_AUDIO_DOMAIN_CPB ? "CPB" : "IVI",
204-
rate,
205+
"domain%u configuration for %u Hz: %s, %dxFS (SCKI: %u Hz)\n",
206+
audio_domain, rate,
205207
clk_id == J721E_CLK_PARENT_48000 ? "PLL4" : "PLL15",
206208
ratios_for_pcm3168a[i], scki);
207209

@@ -263,10 +265,11 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream)
263265

264266
domain->active++;
265267

266-
if (priv->audio_domains[J721E_AUDIO_DOMAIN_CPB].rate)
267-
active_rate = priv->audio_domains[J721E_AUDIO_DOMAIN_CPB].rate;
268-
else
269-
active_rate = priv->audio_domains[J721E_AUDIO_DOMAIN_IVI].rate;
268+
for (i = 0; i < J721E_AUDIO_DOMAIN_LAST; i++) {
269+
active_rate = priv->audio_domains[i].rate;
270+
if (active_rate)
271+
break;
272+
}
270273

271274
if (active_rate)
272275
ret = snd_pcm_hw_constraint_single(substream->runtime,
@@ -819,7 +822,7 @@ static int j721e_soc_probe(struct platform_device *pdev)
819822
struct snd_soc_card *card;
820823
const struct of_device_id *match;
821824
struct j721e_priv *priv;
822-
int link_cnt, conf_cnt, ret;
825+
int link_cnt, conf_cnt, ret, i;
823826

824827
if (!node) {
825828
dev_err(&pdev->dev, "of node is missing.\n");
@@ -843,8 +846,9 @@ static int j721e_soc_probe(struct platform_device *pdev)
843846
if (!priv->dai_links)
844847
return -ENOMEM;
845848

846-
priv->audio_domains[J721E_AUDIO_DOMAIN_CPB].parent_clk_id = -1;
847-
priv->audio_domains[J721E_AUDIO_DOMAIN_IVI].parent_clk_id = -1;
849+
for (i = 0; i < J721E_AUDIO_DOMAIN_LAST; i++)
850+
priv->audio_domains[i].parent_clk_id = -1;
851+
848852
priv->dev = &pdev->dev;
849853
card = &priv->card;
850854
card->dev = &pdev->dev;

0 commit comments

Comments
 (0)