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

Commit 359d9abd authored by Sugar Zhang's avatar Sugar Zhang Committed by Mark Brown
Browse files

ASoC: rockchip: i2s: rename I2S_CKR_TRCM_TX/RXSHARE to I2S_CKR_TRCM_TX/RXONLY 



this patch make it more reasonable and readable, because when we chose
I2S_CKR_TRCM_TXONLY, we only output clk_lrck_tx, and hardware need to
confirm this signal is wired to external codec lrck_tx/rx at the same time.

for convenience, we just handle lrck_txonly if we enable symmetric_rates
in driver and dai_link. otherwise, we use the separate lrck_tx/rx.

Signed-off-by: default avatarSugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: default avatarXing Zheng <zhengxing@rock-chips.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92110093

sound/soc/rockchip/rockchip_i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, 
			   I2S_DMACR_RDL(16));



	val = I2S_CKR_TRCM_TXRX;

	if (dai->driver->symmetric_rates || rtd->dai_link->symmetric_rates)

		val = I2S_CKR_TRCM_TXSHARE;

	if (dai->driver->symmetric_rates && rtd->dai_link->symmetric_rates)

		val = I2S_CKR_TRCM_TXONLY;



	regmap_update_bits(i2s->regmap, I2S_CKR,

			   I2S_CKR_TRCM_MASK,

sound/soc/rockchip/rockchip_i2s.h

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ 
#define I2S_CKR_TRCM_SHIFT	28

#define I2S_CKR_TRCM(x)	(x << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_TRCM_TXRX	(0 << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_TRCM_TXSHARE	(1 << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_TRCM_RXSHARE	(2 << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_TRCM_TXONLY	(1 << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_TRCM_RXONLY	(2 << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_TRCM_MASK	(3 << I2S_CKR_TRCM_SHIFT)

#define I2S_CKR_MSS_SHIFT	27

#define I2S_CKR_MSS_MASTER	(0 << I2S_CKR_MSS_SHIFT)