Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: rsnd: rename clk to clkin
Current adg.c is usig "clk" as clock IN, but is using "clkout" for
clock OUT. This patch arranges "clk" to "clkin".
This is prepare for R-Car Gen4 support.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87y1pi5emh.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Kuninori Morimoto
and committed by
Mark Brown
4bbff16d
184d82e1
+20
-19
+20
-19
sound/soc/sh/rcar/adg.c
+20
-19
sound/soc/sh/rcar/adg.c
···
11
11
#define CLKB 1
12
12
#define CLKC 2
13
13
#define CLKI 3
14
-
#define CLKMAX 4
14
+
#define CLKINMAX 4
15
15
16
16
#define CLKOUT 0
17
17
#define CLKOUT1 1
···
26
26
};
27
27
28
28
struct rsnd_adg {
29
-
struct clk *clk[CLKMAX];
29
+
struct clk *clkin[CLKINMAX];
30
30
struct clk *clkout[CLKOUTMAX];
31
31
struct clk *null_clk;
32
32
struct clk_onecell_data onecell;
33
33
struct rsnd_mod mod;
34
-
int clk_rate[CLKMAX];
34
+
int clkin_rate[CLKINMAX];
35
35
u32 ckr;
36
36
u32 rbga;
37
37
u32 rbgb;
···
40
40
int rbgb_rate_for_48khz; /* RBGB */
41
41
};
42
42
43
-
#define for_each_rsnd_clk(pos, adg, i) \
43
+
#define for_each_rsnd_clkin(pos, adg, i) \
44
44
for (i = 0; \
45
-
(i < CLKMAX) && \
46
-
((pos) = adg->clk[i]); \
45
+
(i < CLKINMAX) && \
46
+
((pos) = adg->clkin[i]); \
47
47
i++)
48
48
#define for_each_rsnd_clkout(pos, adg, i) \
49
49
for (i = 0; \
···
52
52
i++)
53
53
#define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg)
54
54
55
-
static const char * const clk_name[] = {
55
+
static const char * const clkin_name[] = {
56
56
[CLKA] = "clk_a",
57
57
[CLKB] = "clk_b",
58
58
[CLKC] = "clk_c",
···
112
112
unsigned int val, en;
113
113
unsigned int min, diff;
114
114
unsigned int sel_rate[] = {
115
-
adg->clk_rate[CLKA], /* 0000: CLKA */
116
-
adg->clk_rate[CLKB], /* 0001: CLKB */
117
-
adg->clk_rate[CLKC], /* 0010: CLKC */
115
+
adg->clkin_rate[CLKA], /* 0000: CLKA */
116
+
adg->clkin_rate[CLKB], /* 0001: CLKB */
117
+
adg->clkin_rate[CLKC], /* 0010: CLKC */
118
118
adg->rbga_rate_for_441khz, /* 0011: RBGA */
119
119
adg->rbgb_rate_for_48khz, /* 0100: RBGB */
120
120
};
···
287
287
int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)
288
288
{
289
289
struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
290
+
struct clk *clk;
290
291
int i;
291
292
int sel_table[] = {
292
293
[CLKA] = 0x1,
···
300
299
* find suitable clock from
301
300
* AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI.
302
301
*/
303
-
for (i = 0; i < CLKMAX; i++)
304
-
if (rate == adg->clk_rate[i])
302
+
for_each_rsnd_clkin(clk, adg, i)
303
+
if (rate == adg->clkin_rate[i])
305
304
return sel_table[i];
306
305
307
306
/*
···
359
358
struct clk *clk;
360
359
int i;
361
360
362
-
for_each_rsnd_clk(clk, adg, i) {
361
+
for_each_rsnd_clkin(clk, adg, i) {
363
362
if (enable) {
364
363
clk_prepare_enable(clk);
365
364
···
368
367
* atomic context. Let's keep it when
369
368
* rsnd_adg_clk_enable() was called
370
369
*/
371
-
adg->clk_rate[i] = clk_get_rate(clk);
370
+
adg->clkin_rate[i] = clk_get_rate(clk);
372
371
} else {
373
372
clk_disable_unprepare(clk);
374
373
}
···
419
418
struct clk *clk;
420
419
int i;
421
420
422
-
for (i = 0; i < CLKMAX; i++) {
423
-
clk = devm_clk_get(dev, clk_name[i]);
421
+
for (i = 0; i < CLKINMAX; i++) {
422
+
clk = devm_clk_get(dev, clkin_name[i]);
424
423
425
424
if (IS_ERR_OR_NULL(clk))
426
425
clk = rsnd_adg_null_clk_get(priv);
427
426
if (IS_ERR_OR_NULL(clk))
428
427
goto err;
429
428
430
-
adg->clk[i] = clk;
429
+
adg->clkin[i] = clk;
431
430
}
432
431
433
432
return 0;
···
517
516
*/
518
517
adg->rbga_rate_for_441khz = 0;
519
518
adg->rbgb_rate_for_48khz = 0;
520
-
for_each_rsnd_clk(clk, adg, i) {
519
+
for_each_rsnd_clkin(clk, adg, i) {
521
520
rate = clk_get_rate(clk);
522
521
523
522
if (0 == rate) /* not used */
···
631
630
struct clk *clk;
632
631
int i;
633
632
634
-
for_each_rsnd_clk(clk, adg, i)
633
+
for_each_rsnd_clkin(clk, adg, i)
635
634
dbg_msg(dev, m, "%-18s : %pa : %ld\n",
636
635
__clk_get_name(clk), clk, clk_get_rate(clk));
637
636