The previous commit removed the only use of these variables.

Signed-off-by: John Keeping john@metanate.com --- sound/soc/rockchip/rockchip_i2s.c | 15 --------------- 1 file changed, 15 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index acc6225..8b0a588 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -34,13 +34,6 @@ 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; };

@@ -84,11 +77,7 @@ 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);

@@ -126,11 +115,7 @@ 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);

The patch

ASoC: rockchip: i2s: separate capture and playback

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From eba65d179c1149cf79e68608d452631f33d7f017 Mon Sep 17 00:00:00 2001

From: John Keeping john@metanate.com Date: Wed, 9 Dec 2015 10:32:26 +0000 Subject: [PATCH] ASoC: rockchip: i2s: separate capture and playback

If we only clear the tx/rx state when both are disabled it is not possible to start/stop one multiple times while the other is running. Since the two are independently controlled, treat them as such and remove the false dependency between capture and playback.

Signed-off-by: John Keeping john@metanate.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/rockchip/rockchip_i2s.c | 72 +++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 83b1b9c9e017..acc6225d8d9d 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -82,8 +82,8 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE);

regmap_update_bits(i2s->regmap, I2S_XFER, - I2S_XFER_TXS_START | I2S_XFER_RXS_START, - I2S_XFER_TXS_START | I2S_XFER_RXS_START); + I2S_XFER_TXS_START, + I2S_XFER_TXS_START);

i2s->tx_start = true; } else { @@ -92,27 +92,23 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);

- if (!i2s->rx_start) { - regmap_update_bits(i2s->regmap, I2S_XFER, - I2S_XFER_TXS_START | - I2S_XFER_RXS_START, - I2S_XFER_TXS_STOP | - I2S_XFER_RXS_STOP); + regmap_update_bits(i2s->regmap, I2S_XFER, + I2S_XFER_TXS_START, + I2S_XFER_TXS_STOP);

- regmap_update_bits(i2s->regmap, I2S_CLR, - I2S_CLR_TXC | I2S_CLR_RXC, - I2S_CLR_TXC | I2S_CLR_RXC); + regmap_update_bits(i2s->regmap, I2S_CLR, + I2S_CLR_TXC, + I2S_CLR_TXC);

- regmap_read(i2s->regmap, I2S_CLR, &val); + regmap_read(i2s->regmap, I2S_CLR, &val);

- /* Should wait for clear operation to finish */ - while (val) { - regmap_read(i2s->regmap, I2S_CLR, &val); - retry--; - if (!retry) { - dev_warn(i2s->dev, "fail to clear\n"); - break; - } + /* Should wait for clear operation to finish */ + while (val & I2S_CLR_TXC) { + regmap_read(i2s->regmap, I2S_CLR, &val); + retry--; + if (!retry) { + dev_warn(i2s->dev, "fail to clear\n"); + break; } } } @@ -128,8 +124,8 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE);

regmap_update_bits(i2s->regmap, I2S_XFER, - I2S_XFER_TXS_START | I2S_XFER_RXS_START, - I2S_XFER_TXS_START | I2S_XFER_RXS_START); + I2S_XFER_RXS_START, + I2S_XFER_RXS_START);

i2s->rx_start = true; } else { @@ -138,27 +134,23 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);

- if (!i2s->tx_start) { - regmap_update_bits(i2s->regmap, I2S_XFER, - I2S_XFER_TXS_START | - I2S_XFER_RXS_START, - I2S_XFER_TXS_STOP | - I2S_XFER_RXS_STOP); + regmap_update_bits(i2s->regmap, I2S_XFER, + I2S_XFER_RXS_START, + I2S_XFER_RXS_STOP);

- regmap_update_bits(i2s->regmap, I2S_CLR, - I2S_CLR_TXC | I2S_CLR_RXC, - I2S_CLR_TXC | I2S_CLR_RXC); + regmap_update_bits(i2s->regmap, I2S_CLR, + I2S_CLR_RXC, + I2S_CLR_RXC);

- regmap_read(i2s->regmap, I2S_CLR, &val); + regmap_read(i2s->regmap, I2S_CLR, &val);

- /* Should wait for clear operation to finish */ - while (val) { - regmap_read(i2s->regmap, I2S_CLR, &val); - retry--; - if (!retry) { - dev_warn(i2s->dev, "fail to clear\n"); - break; - } + /* Should wait for clear operation to finish */ + while (val & I2S_CLR_RXC) { + regmap_read(i2s->regmap, I2S_CLR, &val); + retry--; + if (!retry) { + dev_warn(i2s->dev, "fail to clear\n"); + break; } } }

Hi John,

2015-12-09 11:32 GMT+01:00 John Keeping john@metanate.com:

If we only clear the tx/rx state when both are disabled it is not possible to start/stop one multiple times while the other is running. Since the two are independently controlled, treat them as such and remove the false dependency between capture and playback.

Signed-off-by: John Keeping john@metanate.com

sound/soc/rockchip/rockchip_i2s.c | 72 +++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 83b1b9c..acc6225 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -82,8 +82,8 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE);

            regmap_update_bits(i2s->regmap, I2S_XFER,

•                              I2S_XFER_TXS_START | I2S_XFER_RXS_START,
  

•                              I2S_XFER_TXS_START | I2S_XFER_RXS_START);
  

•                              I2S_XFER_TXS_START,
  

•                              I2S_XFER_TXS_START);
  
            i2s->tx_start = true;
    } else {
  

@@ -92,27 +92,23 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);

•           if (!i2s->rx_start) {
  

•                   regmap_update_bits(i2s->regmap, I2S_XFER,
  

•                                      I2S_XFER_TXS_START |
  

•                                      I2S_XFER_RXS_START,
  

•                                      I2S_XFER_TXS_STOP |
  

•                                      I2S_XFER_RXS_STOP);
  

•           regmap_update_bits(i2s->regmap, I2S_XFER,
  

•                              I2S_XFER_TXS_START,
  

•                              I2S_XFER_TXS_STOP);
  
  

•                   regmap_update_bits(i2s->regmap, I2S_CLR,
  

•                                      I2S_CLR_TXC | I2S_CLR_RXC,
  

•                                      I2S_CLR_TXC | I2S_CLR_RXC);
  

•           regmap_update_bits(i2s->regmap, I2S_CLR,
  

•                              I2S_CLR_TXC,
  

•                              I2S_CLR_TXC);
  
  

•                   regmap_read(i2s->regmap, I2S_CLR, &val);
  

•           regmap_read(i2s->regmap, I2S_CLR, &val);
  
  

•                   /* Should wait for clear operation to finish */
  

•                   while (val) {
  

•                           regmap_read(i2s->regmap, I2S_CLR, &val);
  

•                           retry--;
  

•                           if (!retry) {
  

•                                   dev_warn(i2s->dev, "fail to clear\n");
  

•                                   break;
  

•                           }
  

•           /* Should wait for clear operation to finish */
  

•           while (val & I2S_CLR_TXC) {
  

•                   regmap_read(i2s->regmap, I2S_CLR, &val);
  

•                   retry--;
  

•                   if (!retry) {
  

•                           dev_warn(i2s->dev, "fail to clear\n");
  

•                           break;
                    }
            }
    }
  

@@ -128,8 +124,8 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE);

            regmap_update_bits(i2s->regmap, I2S_XFER,

•                              I2S_XFER_TXS_START | I2S_XFER_RXS_START,
  

•                              I2S_XFER_TXS_START | I2S_XFER_RXS_START);
  

•                              I2S_XFER_RXS_START,
  

•                              I2S_XFER_RXS_START);
  
            i2s->rx_start = true;
    } else {
  

@@ -138,27 +134,23 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);

•           if (!i2s->tx_start) {
  

•                   regmap_update_bits(i2s->regmap, I2S_XFER,
  

•                                      I2S_XFER_TXS_START |
  

•                                      I2S_XFER_RXS_START,
  

•                                      I2S_XFER_TXS_STOP |
  

•                                      I2S_XFER_RXS_STOP);
  

•           regmap_update_bits(i2s->regmap, I2S_XFER,
  

•                              I2S_XFER_RXS_START,
  

•                              I2S_XFER_RXS_STOP);
  
  

•                   regmap_update_bits(i2s->regmap, I2S_CLR,
  

•                                      I2S_CLR_TXC | I2S_CLR_RXC,
  

•                                      I2S_CLR_TXC | I2S_CLR_RXC);
  

•           regmap_update_bits(i2s->regmap, I2S_CLR,
  

•                              I2S_CLR_RXC,
  

•                              I2S_CLR_RXC);
  
  

•                   regmap_read(i2s->regmap, I2S_CLR, &val);
  

•           regmap_read(i2s->regmap, I2S_CLR, &val);
  
  

•                   /* Should wait for clear operation to finish */
  

•                   while (val) {
  

•                           regmap_read(i2s->regmap, I2S_CLR, &val);
  

•                           retry--;
  

•                           if (!retry) {
  

•                                   dev_warn(i2s->dev, "fail to clear\n");
  

•                                   break;
  

•                           }
  

•           /* Should wait for clear operation to finish */
  

•           while (val & I2S_CLR_RXC) {
  

•                   regmap_read(i2s->regmap, I2S_CLR, &val);
  

•                   retry--;
  

•                   if (!retry) {
  

•                           dev_warn(i2s->dev, "fail to clear\n");
  

•                           break;
                    }
            }
    }
  

-- 2.6.3.462.gbe2c914

-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

Using my Veyron Jerry Chromebook wiht latest kernel I found that the speakers doesn't work. Bisect points to this patch as the offending commit. However your changes looks reasonable the fact is that reverting the patch makes the audio work again on my device. I need to dig a bit more into the issue, but meanwhile, any idea on what is happening ? Can I ask which device did you test?

PS: Sorry for the noise if you received the email twice.

Best regards, Enric