diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-18 11:55:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-18 11:55:27 +0000 |
| commit | 932505776779430053766113965c21cfb7ab823a (patch) | |
| tree | 2d40403b4cb2d9f386c77e1af325ec2b942bac9b /sound/soc | |
| parent | ec49e8164f088917ae800ce061d9e93efae6934c (diff) | |
| parent | c66234cfedfc3e6e3b62563a5f2c1562be09a35d (diff) | |
| download | linux-932505776779430053766113965c21cfb7ab823a.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 6 |
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; } |