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

Commit a6e806c4 authored by John Keeping's avatar John Keeping Committed by Mark Brown
Browse files

ASoC: rockchip: Revert "ASoC: rockchip: i2s: remove unused variables" 



This reverts commit 5938448b.

It turns out that the commit that made these variables unused is wrong
so we're about to revert it.  Bring back the variables in prepration.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f55532a0

sound/soc/rockchip/rockchip_i2s.c

+15 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ struct rk_i2s_dev { 


	struct regmap *regmap;



/*

 * Used to indicate the tx/rx status.

 * I2S controller hopes to start the tx and rx together,

 * also to stop them when they are both try to stop.

*/

	bool tx_start;

	bool rx_start;

	bool is_master_mode;

};
@@ -77,7 +84,11 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) 
		regmap_update_bits(i2s->regmap, I2S_XFER,

				   I2S_XFER_TXS_START,

				   I2S_XFER_TXS_START);



		i2s->tx_start = true;

	} else {

		i2s->tx_start = false;



		regmap_update_bits(i2s->regmap, I2S_DMACR,

				   I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);
@@ -115,7 +126,11 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) 
		regmap_update_bits(i2s->regmap, I2S_XFER,

				   I2S_XFER_RXS_START,

				   I2S_XFER_RXS_START);



		i2s->rx_start = true;

	} else {

		i2s->rx_start = false;



		regmap_update_bits(i2s->regmap, I2S_DMACR,

				   I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);