Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus (15fc3a22) · Commits · 戴 / test

sound/soc/rockchip/rockchip_i2s.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}