Commit 15fc3a22 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus

parents 5b139ebe c66234cf
...@@ -504,6 +504,7 @@ static bool rockchip_i2s_rd_reg(struct device *dev, unsigned int reg) ...@@ -504,6 +504,7 @@ static bool rockchip_i2s_rd_reg(struct device *dev, unsigned int reg)
case I2S_INTCR: case I2S_INTCR:
case I2S_XFER: case I2S_XFER:
case I2S_CLR: case I2S_CLR:
case I2S_TXDR:
case I2S_RXDR: case I2S_RXDR:
case I2S_FIFOLR: case I2S_FIFOLR:
case I2S_INTSR: case I2S_INTSR:
...@@ -518,6 +519,9 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg) ...@@ -518,6 +519,9 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg)
switch (reg) { switch (reg) {
case I2S_INTSR: case I2S_INTSR:
case I2S_CLR: case I2S_CLR:
case I2S_FIFOLR:
case I2S_TXDR:
case I2S_RXDR:
return true; return true;
default: default:
return false; return false;
...@@ -527,6 +531,8 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg) ...@@ -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) static bool rockchip_i2s_precious_reg(struct device *dev, unsigned int reg)
{ {
switch (reg) { switch (reg) {
case I2S_RXDR:
return true;
default: default:
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment