Commit 6cba3fa9 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: more clear ADG clock debug info 



ADG inputs clock from CLK{A,B,C,I} and outputs clock from
CLKOUT{0,1,2,3} which is selected by BRG{A,B}.
Now, ADG is assuming BRGA is for 44100Hz related clocks,
BRGB is for 48000Hz related clocks.

Clock related debug is very difficult/confusable.
This patch cleanups clock related debug info.

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

sound/soc/sh/rcar/adg.c

+41 −18
Original line number Diff line number Diff line
@@ -57,6 +57,13 @@ struct rsnd_adg { 
	     i++)

#define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg)



static const char * const clk_name[] = {

	[CLKA]	= "clk_a",

	[CLKB]	= "clk_b",

	[CLKC]	= "clk_c",

	[CLKI]	= "clk_i",

};



static u32 rsnd_adg_calculate_rbgx(unsigned long div)

{

	int i, ratio;
@@ -279,6 +286,7 @@ static void rsnd_adg_set_ssi_clk(struct rsnd_mod *ssi_mod, u32 val) 
	struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);

	struct rsnd_adg *adg = rsnd_priv_to_adg(priv);

	struct rsnd_mod *adg_mod = rsnd_mod_get(adg);

	struct device *dev = rsnd_priv_to_dev(priv);

	int id = rsnd_mod_id(ssi_mod);

	int shift = (id % 4) * 8;

	u32 mask = 0xFF << shift;
@@ -305,12 +313,13 @@ static void rsnd_adg_set_ssi_clk(struct rsnd_mod *ssi_mod, u32 val) 
		rsnd_mod_bset(adg_mod, AUDIO_CLK_SEL2, mask, val);

		break;

	}



	dev_dbg(dev, "AUDIO_CLK_SEL is 0x%x\n", val);

}



int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)

{

	struct rsnd_adg *adg = rsnd_priv_to_adg(priv);

	struct device *dev = rsnd_priv_to_dev(priv);

	struct clk *clk;

	int i;

	int sel_table[] = {
@@ -320,8 +329,6 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate) 
		[CLKI] = 0x0,

	};



	dev_dbg(dev, "request clock = %d\n", rate);



	/*

	 * find suitable clock from

	 * AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI.
@@ -377,9 +384,10 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate) 
	rsnd_mod_write(adg_mod, BRRA,  adg->rbga);

	rsnd_mod_write(adg_mod, BRRB,  adg->rbgb);



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

		rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod),

		data, rate);

	dev_dbg(dev, "CLKOUT is based on BRG%c (= %dHz)\n",

		(ckr) ? 'B' : 'A',

		(ckr) ?	adg->rbgb_rate_for_48khz :

			adg->rbga_rate_for_441khz);



	return 0;

}
@@ -408,21 +416,12 @@ static void rsnd_adg_get_clkin(struct rsnd_priv *priv, 
{

	struct device *dev = rsnd_priv_to_dev(priv);

	struct clk *clk;

	static const char * const clk_name[] = {

		[CLKA]	= "clk_a",

		[CLKB]	= "clk_b",

		[CLKC]	= "clk_c",

		[CLKI]	= "clk_i",

	};

	int i;



	for (i = 0; i < CLKMAX; i++) {

		clk = devm_clk_get(dev, clk_name[i]);

		adg->clk[i] = IS_ERR(clk) ? NULL : clk;

	}



	for_each_rsnd_clk(clk, adg, i)

		dev_dbg(dev, "clk %d : %p : %ld\n", i, clk, clk_get_rate(clk));

}



static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
@@ -571,12 +570,35 @@ rsnd_adg_get_clkout_end: 
	adg->ckr = ckr;

	adg->rbga = rbga;

	adg->rbgb = rbgb;

}



#ifdef DEBUG

static void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct rsnd_adg *adg)

{

	struct device *dev = rsnd_priv_to_dev(priv);

	struct clk *clk;

	int i;



	for_each_rsnd_clk(clk, adg, i)

		dev_dbg(dev, "%s    : %p : %ld\n",

			clk_name[i], clk, clk_get_rate(clk));



	for_each_rsnd_clkout(clk, adg, i)

		dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk));

	dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",

		ckr, rbga, rbgb);

		adg->ckr, adg->rbga, adg->rbgb);

	dev_dbg(dev, "BRGA (for 44100 base) = %d\n", adg->rbga_rate_for_441khz);

	dev_dbg(dev, "BRGB (for 48000 base) = %d\n", adg->rbgb_rate_for_48khz);



	/*

	 * Actual CLKOUT will be exchanged in rsnd_adg_ssi_clk_try_start()

	 * by BRGCKR::BRGCKR_31

	 */

	for_each_rsnd_clkout(clk, adg, i)

		dev_dbg(dev, "clkout %d : %p : %ld\n", i,

			clk, clk_get_rate(clk));

}

#else

#define rsnd_adg_clk_dbg_info(priv, adg)

#endif



int rsnd_adg_probe(struct rsnd_priv *priv)

{
@@ -595,6 +617,7 @@ int rsnd_adg_probe(struct rsnd_priv *priv) 


	rsnd_adg_get_clkin(priv, adg);

	rsnd_adg_get_clkout(priv, adg);

	rsnd_adg_clk_dbg_info(priv, adg);



	priv->adg = adg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE