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

Commit 7808aa30 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: make sure variable name for 44.1kHz/48kHz 



This driver is assuming that
RBGA is used as source clock of 44.1kHz category, and
RBGB is used as source clock of 48kHz category.
This patch clarifies the variable name.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 690ef81e

sound/soc/sh/rcar/adg.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -19,8 +19,8 @@ 
struct rsnd_adg {

struct rsnd_adg {

	struct clk *clk[CLKMAX];

	struct clk *clk[CLKMAX];





	int rate_of_441khz_div_6;

	int rbga_rate_for_441khz_div_6;	/* RBGA */

	int rate_of_48khz_div_6;

	int rbgb_rate_for_48khz_div_6;	/* RBGB */

	u32 ckr;

	u32 ckr;

};

};
@@ -101,12 +101,12 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate) 
	/*

	/*

	 * find 1/6 clock from BRGA/BRGB

	 * find 1/6 clock from BRGA/BRGB

	 */

	 */

	if (rate == adg->rate_of_441khz_div_6) {

	if (rate == adg->rbga_rate_for_441khz_div_6) {

		data = 0x10;

		data = 0x10;

		goto found_clock;

		goto found_clock;

	}

	}





	if (rate == adg->rate_of_48khz_div_6) {

	if (rate == adg->rbgb_rate_for_48khz_div_6) {

		data = 0x20;

		data = 0x20;

		goto found_clock;

		goto found_clock;

	}

	}
@@ -156,8 +156,8 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) 
	 *	rsnd_adg_ssi_clk_try_start()

	 *	rsnd_adg_ssi_clk_try_start()

	 */

	 */

	ckr = 0;

	ckr = 0;

	adg->rate_of_441khz_div_6 = 0;

	adg->rbga_rate_for_441khz_div_6 = 0;

	adg->rate_of_48khz_div_6  = 0;

	adg->rbgb_rate_for_48khz_div_6  = 0;

	for_each_rsnd_clk(clk, adg, i) {

	for_each_rsnd_clk(clk, adg, i) {

		rate = clk_get_rate(clk);

		rate = clk_get_rate(clk);
@@ -165,14 +165,14 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) 
			continue;

			continue;





		/* RBGA */

		/* RBGA */

		if (!adg->rate_of_441khz_div_6 && (0 == rate % 44100)) {

		if (!adg->rbga_rate_for_441khz_div_6 && (0 == rate % 44100)) {

			adg->rate_of_441khz_div_6 = rate / 6;

			adg->rbga_rate_for_441khz_div_6 = rate / 6;

			ckr |= brg_table[i] << 20;

			ckr |= brg_table[i] << 20;

		}

		}





		/* RBGB */

		/* RBGB */

		if (!adg->rate_of_48khz_div_6 && (0 == rate % 48000)) {

		if (!adg->rbgb_rate_for_48khz_div_6 && (0 == rate % 48000)) {

			adg->rate_of_48khz_div_6 = rate / 6;

			adg->rbgb_rate_for_48khz_div_6 = rate / 6;

			ckr |= brg_table[i] << 16;

			ckr |= brg_table[i] << 16;

		}

		}

	}

	}