Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc20319 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: adg :: AUDIO-CLKOUTn asynchronizes support 



AUDIO-CLKOUTn can asynchronizes with L/R clock.
AUDIO-CLKOUTn synchronizes with L/R clock is now default behavior.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 52fd98bc

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+2 −0
Original line number Diff line number Diff line
@@ -373,6 +373,8 @@ Optional properties: 
- #clock-cells			: it must be 0 if your system has audio_clkout

				  it must be 1 if your system has audio_clkout0/1/2/3

- clock-frequency		: for all audio_clkout0/1/2/3

- clkout-lr-asynchronous	: boolean property. it indicates that audio_clkoutn

				  is asynchronizes with lr-clock.



SSI subnode properties:

- interrupts			: Should contain SSI interrupt for PIO transfer

sound/soc/sh/rcar/adg.c

+18 −0
Original line number Diff line number Diff line
@@ -33,11 +33,15 @@ struct rsnd_adg { 
	struct clk *clkout[CLKOUTMAX];

	struct clk_onecell_data onecell;

	struct rsnd_mod mod;

	u32 flags;



	int rbga_rate_for_441khz; /* RBGA */

	int rbgb_rate_for_48khz;  /* RBGB */

};



#define LRCLK_ASYNC	(1 << 0)

#define adg_mode_flags(adg)	(adg->flags)



#define for_each_rsnd_clk(pos, adg, i)		\

	for (i = 0;				\

	     (i < CLKMAX) &&			\
@@ -355,6 +359,16 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate) 


	rsnd_adg_set_ssi_clk(ssi_mod, data);



	if (!(adg_mode_flags(adg) & LRCLK_ASYNC)) {

		struct rsnd_mod *adg_mod = rsnd_mod_get(adg);

		u32 ckr = 0;



		if (0 == (rate % 8000))

			ckr = 0x80000000;



		rsnd_mod_bset(adg_mod, SSICKR, 0x80000000, ckr);

	}



	dev_dbg(dev, "ADG: %s[%d] selects 0x%x for %d\n",

		rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod),

		data, rate);
@@ -532,6 +546,7 @@ int rsnd_adg_probe(struct rsnd_priv *priv) 
{

	struct rsnd_adg *adg;

	struct device *dev = rsnd_priv_to_dev(priv);

	struct device_node *np = dev->of_node;



	adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL);

	if (!adg) {
@@ -545,6 +560,9 @@ int rsnd_adg_probe(struct rsnd_priv *priv) 
	rsnd_adg_get_clkin(priv, adg);

	rsnd_adg_get_clkout(priv, adg);



	if (of_get_property(np, "clkout-lr-asynchronous", NULL))

		adg->flags = LRCLK_ASYNC;



	priv->adg = adg;



	return 0;