Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: rsnd: remove unnecessary ADG flags
The flag LRCLK_ASYNC / AUDIO_OUT_48 had been added to handling
special case of Salvator-X board, but it is not used on upstream.
It makes code complex today, let's remove these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87zg9y5emm.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Kuninori Morimoto
and committed by
Mark Brown
184d82e1
3e262e95
+4
-21
+4
-21
sound/soc/sh/rcar/adg.c
+4
-21
sound/soc/sh/rcar/adg.c
···
32
32
struct clk_onecell_data onecell;
33
33
struct rsnd_mod mod;
34
34
int clk_rate[CLKMAX];
35
-
u32 flags;
36
35
u32 ckr;
37
36
u32 rbga;
38
37
u32 rbgb;
···
39
40
int rbga_rate_for_441khz; /* RBGA */
40
41
int rbgb_rate_for_48khz; /* RBGB */
41
42
};
42
-
43
-
#define LRCLK_ASYNC (1 << 0)
44
-
#define AUDIO_OUT_48 (1 << 1)
45
43
46
44
#define for_each_rsnd_clk(pos, adg, i) \
47
45
for (i = 0; \
···
337
341
338
342
rsnd_adg_set_ssi_clk(ssi_mod, data);
339
343
340
-
if (rsnd_flags_has(adg, LRCLK_ASYNC)) {
341
-
if (rsnd_flags_has(adg, AUDIO_OUT_48))
342
-
ckr = 0x80000000;
343
-
} else {
344
-
if (0 == (rate % 8000))
345
-
ckr = 0x80000000;
346
-
}
344
+
if (0 == (rate % 8000))
345
+
ckr = 0x80000000; /* BRGB output = 48kHz */
347
346
348
347
rsnd_mod_bset(adg_mod, BRGCKR, 0x80770000, adg->ckr | ckr);
349
348
rsnd_mod_write(adg_mod, BRRA, adg->rbga);
···
505
514
req_48kHz_rate = req_rate[i];
506
515
}
507
516
508
-
if (req_rate[0] % 48000 == 0)
509
-
rsnd_flags_set(adg, AUDIO_OUT_48);
510
-
511
-
if (of_get_property(np, "clkout-lr-asynchronous", NULL))
512
-
rsnd_flags_set(adg, LRCLK_ASYNC);
513
-
514
517
/*
515
518
* This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC
516
519
* have 44.1kHz or 48kHz base clocks for now.
···
532
547
rbga = rbgx;
533
548
adg->rbga_rate_for_441khz = rate / div;
534
549
ckr |= brg_table[i] << 20;
535
-
if (req_441kHz_rate &&
536
-
!rsnd_flags_has(adg, AUDIO_OUT_48))
550
+
if (req_441kHz_rate)
537
551
parent_clk_name = __clk_get_name(clk);
538
552
}
539
553
}
···
547
563
rbgb = rbgx;
548
564
adg->rbgb_rate_for_48khz = rate / div;
549
565
ckr |= brg_table[i] << 16;
550
-
if (req_48kHz_rate &&
551
-
rsnd_flags_has(adg, AUDIO_OUT_48))
566
+
if (req_48kHz_rate)
552
567
parent_clk_name = __clk_get_name(clk);
553
568
}
554
569
}