summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 13:28:41 +0100
committerMark Brown <broonie@kernel.org>2018-01-12 13:28:41 +0100
commit15fc3a22511bd1fa13be95c2c6020c3b372a2a65 (patch)
tree8af350a54010ce154b26c2f0f93d02683b733201 /sound/soc
parentMerge remote-tracking branch 'asoc/fix/intel' into asoc-linus (diff)
parentASoC: rockchip: i2s: fix playback after runtime resume (diff)
downloadlinux-15fc3a22511bd1fa13be95c2c6020c3b372a2a65.tar.xz
linux-15fc3a22511bd1fa13be95c2c6020c3b372a2a65.zip
Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/rockchip/rockchip_i2s.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 908211e1d6fc..eb27f6c24bf7 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -504,6 +504,7 @@ static bool rockchip_i2s_rd_reg(struct device *dev, unsigned int reg)
case I2S_INTCR:
case I2S_XFER:
case I2S_CLR:
+ case I2S_TXDR:
case I2S_RXDR:
case I2S_FIFOLR:
case I2S_INTSR:
@@ -518,6 +519,9 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg)
switch (reg) {
case I2S_INTSR:
case I2S_CLR:
+ case I2S_FIFOLR:
+ case I2S_TXDR:
+ case I2S_RXDR:
return true;
default:
return false;
@@ -527,6 +531,8 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg)
static bool rockchip_i2s_precious_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
+ case I2S_RXDR:
+ return true;
default:
return false;
}