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
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
From 8d6dbc6ec4ba17aa381fd1ece575dba7f0667de1 Mon Sep 17 00:00:00 2001
From: Tomasz Figa <t.figa@samsung.com>
Date: Thu, 28 Feb 2013 18:48:54 +0100
Subject: [PATCH 0141/1302] sound: samsung: i2s: Correct I2S clock handling
Moving to Common Clock Framework introduced the need to configure clock
hierarchy and rates in driver.
This patch reworks clock handling in samsung-i2s driver to meet this
requirement.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
---
sound/soc/samsung/i2s.c | 123 +++++++++++++++++++++++++++++++++++++++++-------
sound/soc/samsung/i2s.h | 1 +
2 files changed, 107 insertions(+), 17 deletions(-)
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 78472d2..e1d976e 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -34,6 +34,13 @@
#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
+#ifndef MHZ
+#define MHZ (1000*1000)
+#endif
+
+#define TARGET_SRPCLK_RATE (200 * MHZ)
+#define TARGET_BUSCLK_RATE (100 * MHZ)
+
enum samsung_dai_type {
TYPE_PRI,
TYPE_SEC,
@@ -59,8 +66,16 @@ struct i2s_dai {
* 0 indicates CPU driver is free to choose any value.
*/
unsigned rfs, bfs;
- /* I2S Controller's core clock */
- struct clk *clk;
+ /* Audss's source clock */
+ struct clk *mout_audss;
+ /* Audss's i2s source clock */
+ struct clk *mout_i2s;
+ /* SRP clock's divider */
+ struct clk *dout_srp;
+ /* Bus clock's divider */
+ struct clk *dout_bus;
+ /* i2s clock's divider */
+ struct clk *dout_i2s;
/* Clock for generating I2S signals */
struct clk *op_clk;
/* Pointer to the Primary_Fifo if this is Sec_Fifo, NULL otherwise */
@@ -400,6 +415,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
u32 mod = readl(i2s->addr + I2SMOD);
switch (clk_id) {
+ case SAMSUNG_I2S_OPCLK:
+ mod &= ~MOD_OPCLK_MASK;
+ mod |= dir;
+ break;
case SAMSUNG_I2S_CDCLK:
/* Shouldn't matter in GATING(CLOCK_IN) mode */
if (dir == SND_SOC_CLOCK_IN)
@@ -433,7 +452,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
clk_id = 1;
if (!any_active(i2s)) {
- if (i2s->op_clk) {
+ if (!IS_ERR(i2s->op_clk)) {
if ((clk_id && !(mod & MOD_IMS_SYSMUX)) ||
(!clk_id && (mod & MOD_IMS_SYSMUX))) {
clk_disable_unprepare(i2s->op_clk);
@@ -451,6 +470,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
else
i2s->op_clk = clk_get(&i2s->pdev->dev,
"i2s_opclk0");
+
+ if (!WARN_ON(IS_ERR(i2s->op_clk)))
+ return -EINVAL;
+
clk_prepare_enable(i2s->op_clk);
i2s->rclk_srcrate = clk_get_rate(i2s->op_clk);
@@ -849,6 +872,70 @@ i2s_delay(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
return delay;
}
+static int clk_set_hierarchy(struct i2s_dai *i2s)
+{
+ struct device *dev = &i2s->pdev->dev;
+ struct clk *fout_epll;
+ unsigned int ret;
+
+ fout_epll = devm_clk_get(dev, "fout_epll");
+ if (IS_ERR(fout_epll)) {
+ dev_err(dev, "failed to get fout_epll clock\n");
+ return PTR_ERR(fout_epll);
+ }
+
+ i2s->mout_audss = devm_clk_get(dev, "mout_audss");
+ if (IS_ERR(i2s->mout_audss)) {
+ dev_err(dev, "failed to get mout_audss clock\n");
+ return PTR_ERR(i2s->mout_audss);
+ }
+
+ i2s->mout_i2s = devm_clk_get(dev, "mout_i2s");
+ if (IS_ERR(i2s->mout_i2s)) {
+ dev_err(dev, "failed to get mout_i2s clock\n");
+ return PTR_ERR(i2s->mout_i2s);
+ }
+
+ i2s->dout_srp = devm_clk_get(dev, "dout_srp");
+ if (IS_ERR(i2s->dout_srp)) {
+ dev_err(dev, "failed to get dout_srp div\n");
+ return PTR_ERR(i2s->dout_srp);
+ }
+
+ i2s->dout_bus = devm_clk_get(dev, "dout_bus");
+ if (IS_ERR(i2s->dout_bus)) {
+ dev_err(dev, "failed to get dout_bus div\n");
+ return PTR_ERR(i2s->dout_bus);
+ }
+
+ i2s->dout_i2s = devm_clk_get(dev, "dout_i2s");
+ if (IS_ERR(i2s->dout_i2s)) {
+ dev_err(dev, "failed to get dout_i2s div\n");
+ return PTR_ERR(i2s->dout_i2s);
+ }
+
+ ret = clk_set_parent(i2s->mout_audss, fout_epll);
+ if (ret) {
+ dev_err(dev, "failed to set parent clock of mout_audss\n");
+ return ret;
+ }
+
+ ret = clk_set_parent(i2s->mout_i2s, i2s->mout_audss);
+ if (ret) {
+ dev_err(dev, "failed to set parent clock of mout_i2s\n");
+ return ret;
+ }
+
+ clk_set_rate(i2s->dout_srp, TARGET_SRPCLK_RATE);
+ clk_set_rate(i2s->dout_bus, TARGET_BUSCLK_RATE);
+
+ dev_dbg(dev, "EPLL rate = %ld\n", clk_get_rate(fout_epll));
+ dev_dbg(dev, "SRP rate = %ld\n", clk_get_rate(i2s->dout_srp));
+ dev_dbg(dev, "BUS rate = %ld\n", clk_get_rate(i2s->dout_bus));
+
+ return 0;
+}
+
#ifdef CONFIG_PM
static int i2s_suspend(struct snd_soc_dai *dai)
{
@@ -884,8 +971,9 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
{
struct i2s_dai *i2s = to_info(dai);
struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+ int ret;
- if (other && other->clk) /* If this is probe on secondary */
+ if (other && other->op_clk) /* If this is probe on secondary */
goto probe_exit;
i2s->addr = ioremap(i2s->base, 0x100);
@@ -894,17 +982,16 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
return -ENXIO;
}
- i2s->clk = clk_get(&i2s->pdev->dev, "iis");
- if (IS_ERR(i2s->clk)) {
- dev_err(&i2s->pdev->dev, "failed to get i2s_clock\n");
- iounmap(i2s->addr);
- return -ENOENT;
+ /* Set clock hierarchy for audio subsystem */
+ ret = clk_set_hierarchy(i2s);
+ if (ret) {
+ dev_err(&i2s->pdev->dev, "failed to set clock hierachy.\n");
+ return ret;
}
- clk_prepare_enable(i2s->clk);
if (other) {
other->addr = i2s->addr;
- other->clk = i2s->clk;
+ other->op_clk = i2s->op_clk;
}
if (i2s->quirks & QUIRK_NEED_RSTCLR)
@@ -937,18 +1024,20 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
struct i2s_dai *i2s = snd_soc_dai_get_drvdata(dai);
struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
- if (!other || !other->clk) {
+ if (!other || !other->op_clk) {
if (i2s->quirks & QUIRK_NEED_RSTCLR)
writel(0, i2s->addr + I2SCON);
- clk_disable_unprepare(i2s->clk);
- clk_put(i2s->clk);
+ if (i2s->op_clk) {
+ clk_disable_unprepare(i2s->op_clk);
+ clk_put(i2s->op_clk);
+ }
iounmap(i2s->addr);
}
- i2s->clk = NULL;
+ i2s->op_clk = ERR_PTR(-EINVAL);
return 0;
}
@@ -1084,7 +1173,7 @@ static int i2s_runtime_suspend(struct device *dev)
{
struct i2s_dai *i2s = dev_get_drvdata(dev);
- clk_disable_unprepare(i2s->clk);
+ clk_disable_unprepare(i2s->op_clk);
return 0;
}
@@ -1093,7 +1182,7 @@ static int i2s_runtime_resume(struct device *dev)
{
struct i2s_dai *i2s = dev_get_drvdata(dev);
- clk_prepare_enable(i2s->clk);
+ clk_prepare_enable(i2s->op_clk);
return 0;
}
diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h
index 7966afc..21ff24e 100644
--- a/sound/soc/samsung/i2s.h
+++ b/sound/soc/samsung/i2s.h
@@ -18,5 +18,6 @@
#define SAMSUNG_I2S_RCLKSRC_0 0
#define SAMSUNG_I2S_RCLKSRC_1 1
#define SAMSUNG_I2S_CDCLK 2
+#define SAMSUNG_I2S_OPCLK 3
#endif /* __SND_SOC_SAMSUNG_I2S_H */
--
1.8.3.2
|
