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

Unverified Commit 203cdf51 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: SSI parent cares SWSP bit 



SSICR has SWSP bit (= Serial WS Polarity) which decides WS pin 1st
channel polarity (low or hi). This bit shouldn't exchange after running.

Current SSI "parent" doesn't care SSICR, just controls clock only.
Because of this behavior, if platform uses SSI0 as playback,
SSI1 as capture, and if user starts capture -> playback order,
SSI0 SSICR::SWSP bit exchanged 0 -> 1 during captureing, and it makes
capture noise.
This patch cares SSICR on SSI parent, too.
Special thanks to Yokoyama-san

Reported-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7cc90a5c

sound/soc/sh/rcar/ssi.c

+21 −11
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define	CHNL_4		(1 << 22)	/* Channels */

#define	CHNL_4		(1 << 22)	/* Channels */

#define	CHNL_6		(2 << 22)	/* Channels */

#define	CHNL_6		(2 << 22)	/* Channels */

#define	CHNL_8		(3 << 22)	/* Channels */

#define	CHNL_8		(3 << 22)	/* Channels */

#define DWL_MASK	(7 << 19)	/* Data Word Length mask */

#define	DWL_8		(0 << 19)	/* Data Word Length */

#define	DWL_8		(0 << 19)	/* Data Word Length */

#define	DWL_16		(1 << 19)	/* Data Word Length */

#define	DWL_16		(1 << 19)	/* Data Word Length */

#define	DWL_18		(2 << 19)	/* Data Word Length */

#define	DWL_18		(2 << 19)	/* Data Word Length */
@@ -353,21 +354,18 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, 
	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	u32 cr_own;

	u32 cr_own	= ssi->cr_own;

	u32 cr_mode;

	u32 cr_mode	= ssi->cr_mode;

	u32 wsr;

	u32 wsr		= ssi->wsr;

	int is_tdm;

	int is_tdm;





	if (rsnd_ssi_is_parent(mod, io))

		return;



	is_tdm = rsnd_runtime_is_ssi_tdm(io);

	is_tdm = rsnd_runtime_is_ssi_tdm(io);





	/*

	/*

	 * always use 32bit system word.

	 * always use 32bit system word.

	 * see also rsnd_ssi_master_clk_enable()

	 * see also rsnd_ssi_master_clk_enable()

	 */

	 */

	cr_own = FORCE | SWL_32;

	cr_own |= FORCE | SWL_32;





	if (rdai->bit_clk_inv)

	if (rdai->bit_clk_inv)

		cr_own |= SCKP;

		cr_own |= SCKP;
@@ -377,9 +375,18 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, 
		cr_own |= SDTA;

		cr_own |= SDTA;

	if (rdai->sys_delay)

	if (rdai->sys_delay)

		cr_own |= DEL;

		cr_own |= DEL;



	/*

	 * We shouldn't exchange SWSP after running.

	 * This means, parent needs to care it.

	 */

	if (rsnd_ssi_is_parent(mod, io))

		goto init_end;



	if (rsnd_io_is_play(io))

	if (rsnd_io_is_play(io))

		cr_own |= TRMD;

		cr_own |= TRMD;





	cr_own &= ~DWL_MASK;

	switch (snd_pcm_format_width(runtime->format)) {

	switch (snd_pcm_format_width(runtime->format)) {

	case 16:

	case 16:

		cr_own |= DWL_16;

		cr_own |= DWL_16;
@@ -406,7 +413,7 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, 
		wsr	|= WS_MODE;

		wsr	|= WS_MODE;

		cr_own	|= CHNL_8;

		cr_own	|= CHNL_8;

	}

	}



init_end:

	ssi->cr_own	= cr_own;

	ssi->cr_own	= cr_own;

	ssi->cr_mode	= cr_mode;

	ssi->cr_mode	= cr_mode;

	ssi->wsr	= wsr;

	ssi->wsr	= wsr;
@@ -470,15 +477,18 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod, 
		return -EIO;

		return -EIO;

	}

	}





	if (!rsnd_ssi_is_parent(mod, io))

		ssi->cr_own	= 0;



	rsnd_ssi_master_clk_stop(mod, io);

	rsnd_ssi_master_clk_stop(mod, io);





	rsnd_mod_power_off(mod);

	rsnd_mod_power_off(mod);





	ssi->usrcnt--;

	ssi->usrcnt--;





	if (!ssi->usrcnt) {

		ssi->cr_own	= 0;

		ssi->cr_mode	= 0;

		ssi->wsr	= 0;

	}



	return 0;

	return 0;

}

}