1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
From 34a1cd97a2ef6f68a12ff2f2fd813548e867f72f Mon Sep 17 00:00:00 2001
From: Viorel Suman <viorel.suman@nxp.com>
Date: Thu, 20 Jun 2019 13:25:15 +0300
Subject: [PATCH] MLK-21957-2: ASoC: fsl_sai: read SAI version and params in
probe
Read SAI IP version and parameters in probe function.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
---
sound/soc/fsl/fsl_sai.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -465,11 +465,12 @@ static int fsl_sai_set_dai_fmt(struct sn
return ret;
}
-static int fsl_sai_check_ver(struct snd_soc_dai *cpu_dai)
+static int fsl_sai_check_ver(struct device *dev)
{
- struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev);
+ struct fsl_sai *sai = dev_get_drvdata(dev);
unsigned char offset = sai->soc->reg_offset;
unsigned int val;
+ int ret;
if (FSL_SAI_TCSR(offset) == FSL_SAI_VERID)
return 0;
@@ -477,16 +478,21 @@ static int fsl_sai_check_ver(struct snd_
if (sai->verid.loaded)
return 0;
- sai->verid.loaded = true;
- regmap_read(sai->regmap, FSL_SAI_VERID, &val);
- dev_dbg(cpu_dai->dev, "VERID: 0x%016X\n", val);
+ ret = regmap_read(sai->regmap, FSL_SAI_VERID, &val);
+ if (ret < 0)
+ return ret;
+
+ dev_dbg(dev, "VERID: 0x%016X\n", val);
sai->verid.id = (val & FSL_SAI_VER_ID_MASK) >> FSL_SAI_VER_ID_SHIFT;
sai->verid.extfifo_en = (val & FSL_SAI_VER_EFIFO_EN);
sai->verid.timestamp_en = (val & FSL_SAI_VER_TSTMP_EN);
- regmap_read(sai->regmap, FSL_SAI_PARAM, &val);
- dev_dbg(cpu_dai->dev, "PARAM: 0x%016X\n", val);
+ ret = regmap_read(sai->regmap, FSL_SAI_PARAM, &val);
+ if (ret < 0)
+ return ret;
+
+ dev_dbg(dev, "PARAM: 0x%016X\n", val);
/* max slots per frame, power of 2 */
sai->param.spf = 1 <<
@@ -499,11 +505,13 @@ static int fsl_sai_check_ver(struct snd_
/* number of datalines implemented */
sai->param.dln = val & FSL_SAI_PAR_DLN_MASK;
- dev_dbg(cpu_dai->dev,
+ dev_dbg(dev,
"Version: 0x%08X, SPF: %u, WPF: %u, DLN: %u\n",
sai->verid.id, sai->param.spf, sai->param.wpf, sai->param.dln
);
+ sai->verid.loaded = true;
+
return 0;
}
@@ -521,8 +529,6 @@ static int fsl_sai_set_bclk(struct snd_s
if (sai->slave_mode[tx])
return 0;
- fsl_sai_check_ver(dai);
-
for (id = 0; id < FSL_SAI_MCLK_MAX; id++) {
clk_rate = clk_get_rate(sai->mclk_clk[id]);
if (!clk_rate)
@@ -1520,6 +1526,10 @@ static int fsl_sai_probe(struct platform
platform_set_drvdata(pdev, sai);
+ ret = fsl_sai_check_ver(&pdev->dev);
+ if (ret < 0)
+ dev_warn(&pdev->dev, "Error reading SAI version: %d\n", ret);
+
pm_runtime_enable(&pdev->dev);
regcache_cache_only(sai->regmap, true);
|
