Skip to content

Commit 0cc8884

Browse files
morimotobroonie
authored andcommitted
ASoC: renesas: rsnd: enable to use "adg" clock
ADG needs its MSTP to use it, and it was handled as "clk_i" before. R-Car Gen2/Gen3 are using it, but Gen4 doesn't have it. "clk_i" is not intuitive for ADG MSTP. Let's enable to use "adg" clock. It can keep compatible with R-Car Gen2/Gen3 and Gen4. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/87sem62x00.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent a714b31 commit 0cc8884

1 file changed

Lines changed: 19 additions & 0 deletions

File tree

  • sound/soc/renesas/rcar

sound/soc/renesas/rcar/adg.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ static struct rsnd_mod_ops adg_ops = {
3131
#define ADG_HZ_SIZE 2
3232

3333
struct rsnd_adg {
34+
struct clk *adg;
3435
struct clk *clkin[CLKINMAX];
3536
struct clk *clkout[CLKOUTMAX];
3637
struct clk *null_clk;
@@ -386,6 +387,10 @@ int rsnd_adg_clk_control(struct rsnd_priv *priv, int enable)
386387
int ret = 0, i;
387388

388389
if (enable) {
390+
ret = clk_prepare_enable(adg->adg);
391+
if (ret < 0)
392+
return ret;
393+
389394
rsnd_mod_bset(adg_mod, BRGCKR, 0x80770000, adg->ckr);
390395
rsnd_mod_write(adg_mod, BRRA, adg->brga);
391396
rsnd_mod_write(adg_mod, BRRB, adg->brgb);
@@ -419,6 +424,10 @@ int rsnd_adg_clk_control(struct rsnd_priv *priv, int enable)
419424
if (ret < 0)
420425
rsnd_adg_clk_disable(priv);
421426

427+
/* disable adg */
428+
if (!enable)
429+
clk_disable_unprepare(adg->adg);
430+
422431
return ret;
423432
}
424433

@@ -475,6 +484,16 @@ static int rsnd_adg_get_clkin(struct rsnd_priv *priv)
475484
clkin_size = ARRAY_SIZE(clkin_name_gen4);
476485
}
477486

487+
/*
488+
* get adg
489+
* No "adg" is not error
490+
*/
491+
clk = devm_clk_get(dev, "adg");
492+
if (IS_ERR_OR_NULL(clk))
493+
clk = rsnd_adg_null_clk_get(priv);
494+
adg->adg = clk;
495+
496+
/* get clkin */
478497
for (i = 0; i < clkin_size; i++) {
479498
clk = devm_clk_get(dev, clkin_name[i]);
480499

0 commit comments

Comments
 (0)