iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rsnd: ssiu: tidyup SSI_MODE1/2 settings

Browse Source 
R-Car Sound can use pin sharing and multi-SSI for
SSI0/1/2/3/4/9.
Because complex HW settings and spaghetti code,
the settings for SSI9 pin sharing with SSI0 doesn't work.

This patch tidyup settings for it.

Reported-by: Hien Dang <hien.dang.eb@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Chaoliang Qin <chaoliang.qin.jg@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-26 10:58:56 +09:00 committed by Mark Brown
parent 472e5df013
commit dfea7b2c5c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
sound/soc/sh/rcar/ssiu.c
View File

@ -60,11 +60,11 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod,
struct rsnd_priv *priv) struct rsnd_priv *priv)
{ {
struct rsnd_dai *rdai = rsnd_io_to_rdai(io); struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
u32 multi_ssi_slaves = rsnd_ssi_multi_slaves_runtime(io); u32 ssis = rsnd_ssi_multi_slaves_runtime(io);
int use_busif = rsnd_ssi_use_busif(io); int use_busif = rsnd_ssi_use_busif(io);
int id = rsnd_mod_id(mod); int id = rsnd_mod_id(mod);
u32 mask1, val1; int is_clk_master = rsnd_rdai_is_clk_master(rdai);
u32 mask2, val2; u32 val1, val2;
int i; int i;
/* clear status */ /* clear status */
@ -89,57 +89,53 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod,
rsnd_mod_bset(mod, SSI_MODE0, (1 << id), !use_busif << id); rsnd_mod_bset(mod, SSI_MODE0, (1 << id), !use_busif << id);
/* /*
* SSI_MODE1 * SSI_MODE1 / SSI_MODE2
*
* FIXME
* sharing/multi with SSI0 are mainly supported
*/ */
mask1 = (1 << 4) | (1 << 20); /* mask sync bit */ val1 = rsnd_mod_read(mod, SSI_MODE1);
mask2 = (1 << 4); /* mask sync bit */ val2 = rsnd_mod_read(mod, SSI_MODE2);
val1 = val2 = 0; if (rsnd_ssi_is_pin_sharing(io)) {
if (id == 8) {
ssis |= (1 << id);
} else if (ssis) {
/* /*
* SSI8 pin is sharing with SSI7, nothing to do. * Multi SSI
*
* set synchronized bit here
*/ */
} else if (rsnd_ssi_is_pin_sharing(io)) {
int shift = -1;
switch (id) { /* SSI4 is synchronized with SSI3 */
case 1: if (ssis & (1 << 4))
shift = 0; val1 |= (1 << 20);
break; /* SSI012 are synchronized */
case 2: if (ssis == 0x0006)
shift = 2; val1 |= (1 << 4);
break; /* SSI0129 are synchronized */
case 4: if (ssis == 0x0206)
shift = 16; val2 |= (1 << 4);
break;
default:
return -EINVAL;
}
mask1 |= 0x3 << shift;
val1 = rsnd_rdai_is_clk_master(rdai) ?
0x2 << shift : 0x1 << shift;
} else if (multi_ssi_slaves) {
mask2 |= 0x00000007;
mask1 |= 0x0000000f;
switch (multi_ssi_slaves) {
case 0x0206: /* SSI0/1/2/9 */
val2 = (1 << 4) | /* SSI0129 sync */
(rsnd_rdai_is_clk_master(rdai) ? 0x2 : 0x1);
/* fall through */
case 0x0006: /* SSI0/1/2 */
val1 = rsnd_rdai_is_clk_master(rdai) ?
0xa : 0x5;
if (!val2) /* SSI012 sync */
val1 |= (1 << 4);
}
} }
rsnd_mod_bset(mod, SSI_MODE1, mask1, val1); /* SSI1 is sharing pin with SSI0 */
rsnd_mod_bset(mod, SSI_MODE2, mask2, val2); if (ssis & (1 << 1))
val1 |= is_clk_master ? 0x2 : 0x1;
/* SSI2 is sharing pin with SSI0 */
if (ssis & (1 << 2))
val1 |= is_clk_master ? 0x2 << 2 :
0x1 << 2;
/* SSI4 is sharing pin with SSI3 */
if (ssis & (1 << 4))
val1 |= is_clk_master ? 0x2 << 16 :
0x1 << 16;
/* SSI9 is sharing pin with SSI0 */
if (ssis & (1 << 9))
val2 |= is_clk_master ? 0x2 : 0x1;
rsnd_mod_bset(mod, SSI_MODE1, 0x0013001f, val1);
rsnd_mod_bset(mod, SSI_MODE2, 0x00000017, val2);
return 0; return 0;
} }