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

Unverified Commit 8af6c521 authored by Jiada Wang's avatar Jiada Wang Committed by Mark Brown
Browse files

ASoC: rsnd: gen: fix SSI9 4/5/6/7 busif related register address 



Currently each SSI unit 's busif mode/adinr/dalign address is
registered by: (in busif4 case)
RSND_GEN_M_REG(SSI_BUSIF4_MODE, 0x500, 0x80)
RSND_GEN_M_REG(SSI_BUSIF4_ADINR,0x504, 0x80)
RSND_GEN_M_REG(SSI_BUSIF4_DALIGN, 0x508, 0x80)

But according to user manual 41.1.4 Register Configuration
ssi9 4/5/6/7 busif mode/adinr/dalign register address
( SSI9-[4/5/6/7]_BUSIF_[MODE/ADINR/DALIGN] )
are out of this rule.

This patch registers ssi9 4/5/6/7 mode/adinr/dalign register
as single register, and access these registers in case of
SSI9 BUSIF 4/5/6/7.

Fixes: commit 8c9d7503 ("ASoC: rsnd: ssiu: Support BUSIF other than BUSIF0")
Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarTimo Wischer <twischer@de.adit-jv.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f938f348

sound/soc/sh/rcar/gen.c

+24 −0
Original line number Diff line number Diff line
@@ -255,6 +255,30 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv) 
		RSND_GEN_M_REG(SSI_MODE,		0xc,	0x80),

		RSND_GEN_M_REG(SSI_CTRL,		0x10,	0x80),

		RSND_GEN_M_REG(SSI_INT_ENABLE,		0x18,	0x80),

		RSND_GEN_S_REG(SSI9_BUSIF0_MODE,	0x48c),

		RSND_GEN_S_REG(SSI9_BUSIF0_ADINR,	0x484),

		RSND_GEN_S_REG(SSI9_BUSIF0_DALIGN,	0x488),

		RSND_GEN_S_REG(SSI9_BUSIF1_MODE,	0x4a0),

		RSND_GEN_S_REG(SSI9_BUSIF1_ADINR,	0x4a4),

		RSND_GEN_S_REG(SSI9_BUSIF1_DALIGN,	0x4a8),

		RSND_GEN_S_REG(SSI9_BUSIF2_MODE,	0x4c0),

		RSND_GEN_S_REG(SSI9_BUSIF2_ADINR,	0x4c4),

		RSND_GEN_S_REG(SSI9_BUSIF2_DALIGN,	0x4c8),

		RSND_GEN_S_REG(SSI9_BUSIF3_MODE,	0x4e0),

		RSND_GEN_S_REG(SSI9_BUSIF3_ADINR,	0x4e4),

		RSND_GEN_S_REG(SSI9_BUSIF3_DALIGN,	0x4e8),

		RSND_GEN_S_REG(SSI9_BUSIF4_MODE,	0xd80),

		RSND_GEN_S_REG(SSI9_BUSIF4_ADINR,	0xd84),

		RSND_GEN_S_REG(SSI9_BUSIF4_DALIGN,	0xd88),

		RSND_GEN_S_REG(SSI9_BUSIF5_MODE,	0xda0),

		RSND_GEN_S_REG(SSI9_BUSIF5_ADINR,	0xda4),

		RSND_GEN_S_REG(SSI9_BUSIF5_DALIGN,	0xda8),

		RSND_GEN_S_REG(SSI9_BUSIF6_MODE,	0xdc0),

		RSND_GEN_S_REG(SSI9_BUSIF6_ADINR,	0xdc4),

		RSND_GEN_S_REG(SSI9_BUSIF6_DALIGN,	0xdc8),

		RSND_GEN_S_REG(SSI9_BUSIF7_MODE,	0xde0),

		RSND_GEN_S_REG(SSI9_BUSIF7_ADINR,	0xde4),

		RSND_GEN_S_REG(SSI9_BUSIF7_DALIGN,	0xde8),

	};



	static const struct rsnd_regmap_field_conf conf_scu[] = {

sound/soc/sh/rcar/rsnd.h

+27 −0
Original line number Diff line number Diff line
@@ -191,6 +191,30 @@ enum rsnd_reg { 
	SSI_SYS_STATUS7,

	HDMI0_SEL,

	HDMI1_SEL,

	SSI9_BUSIF0_MODE,

	SSI9_BUSIF1_MODE,

	SSI9_BUSIF2_MODE,

	SSI9_BUSIF3_MODE,

	SSI9_BUSIF4_MODE,

	SSI9_BUSIF5_MODE,

	SSI9_BUSIF6_MODE,

	SSI9_BUSIF7_MODE,

	SSI9_BUSIF0_ADINR,

	SSI9_BUSIF1_ADINR,

	SSI9_BUSIF2_ADINR,

	SSI9_BUSIF3_ADINR,

	SSI9_BUSIF4_ADINR,

	SSI9_BUSIF5_ADINR,

	SSI9_BUSIF6_ADINR,

	SSI9_BUSIF7_ADINR,

	SSI9_BUSIF0_DALIGN,

	SSI9_BUSIF1_DALIGN,

	SSI9_BUSIF2_DALIGN,

	SSI9_BUSIF3_DALIGN,

	SSI9_BUSIF4_DALIGN,

	SSI9_BUSIF5_DALIGN,

	SSI9_BUSIF6_DALIGN,

	SSI9_BUSIF7_DALIGN,



	/* SSI */

	SSICR,
@@ -209,6 +233,9 @@ enum rsnd_reg { 
#define SSI_BUSIF_MODE(i)	(SSI_BUSIF0_MODE + (i))

#define SSI_BUSIF_ADINR(i)	(SSI_BUSIF0_ADINR + (i))

#define SSI_BUSIF_DALIGN(i)	(SSI_BUSIF0_DALIGN + (i))

#define SSI9_BUSIF_MODE(i)	(SSI9_BUSIF0_MODE + (i))

#define SSI9_BUSIF_ADINR(i)	(SSI9_BUSIF0_ADINR + (i))

#define SSI9_BUSIF_DALIGN(i)	(SSI9_BUSIF0_DALIGN + (i))

#define SSI_SYS_STATUS(i)	(SSI_SYS_STATUS0 + (i))

sound/soc/sh/rcar/ssiu.c

+11 −13
Original line number Diff line number Diff line
@@ -181,28 +181,26 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, 
	if (rsnd_ssi_use_busif(io)) {

		int id = rsnd_mod_id(mod);

		int busif = rsnd_mod_id_sub(mod);

		enum rsnd_reg adinr_reg, mode_reg, dalign_reg;



		/*

		 * FIXME

		 *

		 * We can't support SSI9-4/5/6/7, because its address is

		 * out of calculation rule

		 */

		if ((id == 9) && (busif >= 4)) {

			struct device *dev = rsnd_priv_to_dev(priv);



			dev_err(dev, "This driver doesn't support SSI%d-%d, so far",

				id, busif);

			adinr_reg = SSI9_BUSIF_ADINR(busif);

			mode_reg = SSI9_BUSIF_MODE(busif);

			dalign_reg = SSI9_BUSIF_DALIGN(busif);

		} else {

			adinr_reg = SSI_BUSIF_ADINR(busif);

			mode_reg = SSI_BUSIF_MODE(busif);

			dalign_reg = SSI_BUSIF_DALIGN(busif);

		}



		rsnd_mod_write(mod, SSI_BUSIF_ADINR(busif),

		rsnd_mod_write(mod, adinr_reg,

			       rsnd_get_adinr_bit(mod, io) |

			       (rsnd_io_is_play(io) ?

				rsnd_runtime_channel_after_ctu(io) :

				rsnd_runtime_channel_original(io)));

		rsnd_mod_write(mod, SSI_BUSIF_MODE(busif),

		rsnd_mod_write(mod, mode_reg,

			       rsnd_get_busif_shift(io, mod) | 1);

		rsnd_mod_write(mod, SSI_BUSIF_DALIGN(busif),

		rsnd_mod_write(mod, dalign_reg,

			       rsnd_get_dalign(mod, io));

	}