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

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

ASoC: rsnd: add rsnd_get_adinr() 



SRC module needs ADINR register settings,
but, it has many similar xxx_ADINR register,
and needs same settings.
This patch adds rsnd_get_adinr() to sharing code.

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

sound/soc/sh/rcar/core.c

+26 −0
Original line number Diff line number Diff line
@@ -309,6 +309,32 @@ void rsnd_dma_quit(struct rsnd_priv *priv, 
	dma->chan = NULL;

}



/*

 *	settting function

 */

u32 rsnd_get_adinr(struct rsnd_mod *mod)

{

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct device *dev = rsnd_priv_to_dev(priv);

	u32 adinr = runtime->channels;



	switch (runtime->sample_bits) {

	case 16:

		adinr |= (8 << 16);

		break;

	case 32:

		adinr |= (0 << 16);

		break;

	default:

		dev_warn(dev, "not supported sample bits\n");

		return 0;

	}



	return adinr;

}



/*

 *	rsnd_dai functions

 */

sound/soc/sh/rcar/rsnd.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ void rsnd_write(struct rsnd_priv *priv, struct rsnd_mod *mod, 
		enum rsnd_reg reg, u32 data);

void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg,

		    u32 mask, u32 data);

u32 rsnd_get_adinr(struct rsnd_mod *mod);



/*

 *	R-Car DMA

sound/soc/sh/rcar/src.c

+3 −23
Original line number Diff line number Diff line
@@ -18,15 +18,6 @@ struct rsnd_src { 


#define RSND_SRC_NAME_SIZE 16



/*

 * ADINR

 */

#define OTBL_24		(0 << 16)

#define OTBL_22		(2 << 16)

#define OTBL_20		(4 << 16)

#define OTBL_18		(6 << 16)

#define OTBL_16		(8 << 16)



#define rsnd_src_convert_rate(p) ((p)->info->convert_rate)

#define rsnd_mod_to_src(_mod)				\

	container_of((_mod), struct rsnd_src, mod)
@@ -197,7 +188,6 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod, 
	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct rsnd_src *src = rsnd_mod_to_src(mod);

	u32 convert_rate = rsnd_src_convert_rate(src);

	u32 adinr = runtime->channels;

	u32 fsrate = 0;



	if (convert_rate)
@@ -214,17 +204,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod, 
	rsnd_mod_write(mod, SRC_SRCIR, 1);



	/* Set channel number and output bit length */

	switch (runtime->sample_bits) {

	case 16:

		adinr |= OTBL_16;

		break;

	case 32:

		adinr |= OTBL_24;

		break;

	default:

		return -EIO;

	}

	rsnd_mod_write(mod, SRC_ADINR, adinr);

	rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod));



	/* Enable the initial value of IFS */

	if (fsrate) {
@@ -487,8 +467,8 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod, 
	if (ret < 0)

		return ret;



	rsnd_mod_write(mod, SSI_BUSIF_ADINR, rsnd_mod_read(mod, SRC_ADINR));

	rsnd_mod_write(mod, SSI_BUSIF_MODE,  rsnd_mod_read(mod, SRC_BUSIF_MODE));

	rsnd_mod_write(mod, SSI_BUSIF_ADINR, rsnd_get_adinr(mod));

	rsnd_mod_write(mod, SSI_BUSIF_MODE,  1);



	rsnd_mod_write(mod, SRC_SRCCR, 0x00011110);