Merge branch 'for-5.6' of... (6c8beff7) · Commits · 戴 / test

include/sound/soc-dapm.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -392,8 +392,6 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol);
		int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol);
		int snd_soc_dapm_put_enum_double_locked(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol);
		int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_info *uinfo);
		int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,

include/sound/soc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1157,7 +1157,7 @@ struct snd_soc_pcm_runtime {
		((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \
		(i)++)
		#define for_each_rtd_codec_dai_rollback(rtd, i, dai) \
		for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);)
		for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);)

		void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);

sound/soc/amd/raven/acp3x-i2s.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
		struct snd_soc_card *card;
		struct acp3x_platform_info *pinfo;
		u32 ret, val, period_bytes, reg_val, ier_val, water_val;
		u32 buf_size, buf_reg;

		prtd = substream->private_data;
		rtd = substream->runtime->private_data;
		@@ -183,6 +184,8 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
		}
		period_bytes = frames_to_bytes(substream->runtime,
		substream->runtime->period_size);
		buf_size = frames_to_bytes(substream->runtime,
		substream->runtime->buffer_size);
		switch (cmd) {
		case SNDRV_PCM_TRIGGER_START:
		case SNDRV_PCM_TRIGGER_RESUME:
		@@ -196,6 +199,7 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
		mmACP_BT_TX_INTR_WATERMARK_SIZE;
		reg_val = mmACP_BTTDM_ITER;
		ier_val = mmACP_BTTDM_IER;
		buf_reg = mmACP_BT_TX_RINGBUFSIZE;
		break;
		case I2S_SP_INSTANCE:
		default:
		@@ -203,6 +207,7 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
		mmACP_I2S_TX_INTR_WATERMARK_SIZE;
		reg_val = mmACP_I2STDM_ITER;
		ier_val = mmACP_I2STDM_IER;
		buf_reg = mmACP_I2S_TX_RINGBUFSIZE;
		}
		} else {
		switch (rtd->i2s_instance) {
		@@ -211,6 +216,7 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
		mmACP_BT_RX_INTR_WATERMARK_SIZE;
		reg_val = mmACP_BTTDM_IRER;
		ier_val = mmACP_BTTDM_IER;
		buf_reg = mmACP_BT_RX_RINGBUFSIZE;
		break;
		case I2S_SP_INSTANCE:
		default:
		@@ -218,9 +224,11 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
		mmACP_I2S_RX_INTR_WATERMARK_SIZE;
		reg_val = mmACP_I2STDM_IRER;
		ier_val = mmACP_I2STDM_IER;
		buf_reg = mmACP_I2S_RX_RINGBUFSIZE;
		}
		}
		rv_writel(period_bytes, rtd->acp3x_base + water_val);
		rv_writel(buf_size, rtd->acp3x_base + buf_reg);
		val = rv_readl(rtd->acp3x_base + reg_val);
		val = val \| BIT(0);
		rv_writel(val, rtd->acp3x_base + reg_val);

sound/soc/amd/raven/acp3x-pcm-dma.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction)
		{
		u16 page_idx;
		u32 low, high, val, acp_fifo_addr, reg_fifo_addr;
		u32 reg_ringbuf_size, reg_dma_size, reg_fifo_size;
		u32 reg_dma_size, reg_fifo_size;
		dma_addr_t addr;

		addr = rtd->dma_addr;
		@@ -157,7 +157,6 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction)
		if (direction == SNDRV_PCM_STREAM_PLAYBACK) {
		switch (rtd->i2s_instance) {
		case I2S_BT_INSTANCE:
		reg_ringbuf_size = mmACP_BT_TX_RINGBUFSIZE;
		reg_dma_size = mmACP_BT_TX_DMA_SIZE;
		acp_fifo_addr = ACP_SRAM_PTE_OFFSET +
		BT_PB_FIFO_ADDR_OFFSET;
		@@ -169,7 +168,6 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction)

		case I2S_SP_INSTANCE:
		default:
		reg_ringbuf_size = mmACP_I2S_TX_RINGBUFSIZE;
		reg_dma_size = mmACP_I2S_TX_DMA_SIZE;
		acp_fifo_addr = ACP_SRAM_PTE_OFFSET +
		SP_PB_FIFO_ADDR_OFFSET;
		@@ -181,7 +179,6 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction)
		} else {
		switch (rtd->i2s_instance) {
		case I2S_BT_INSTANCE:
		reg_ringbuf_size = mmACP_BT_RX_RINGBUFSIZE;
		reg_dma_size = mmACP_BT_RX_DMA_SIZE;
		acp_fifo_addr = ACP_SRAM_PTE_OFFSET +
		BT_CAPT_FIFO_ADDR_OFFSET;
		@@ -193,7 +190,6 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction)

		case I2S_SP_INSTANCE:
		default:
		reg_ringbuf_size = mmACP_I2S_RX_RINGBUFSIZE;
		reg_dma_size = mmACP_I2S_RX_DMA_SIZE;
		acp_fifo_addr = ACP_SRAM_PTE_OFFSET +
		SP_CAPT_FIFO_ADDR_OFFSET;
		@@ -203,7 +199,6 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction)
		rtd->acp3x_base + mmACP_I2S_RX_RINGBUFADDR);
		}
		}
		rv_writel(MAX_BUFFER, rtd->acp3x_base + reg_ringbuf_size);
		rv_writel(DMA_SIZE, rtd->acp3x_base + reg_dma_size);
		rv_writel(acp_fifo_addr, rtd->acp3x_base + reg_fifo_addr);
		rv_writel(FIFO_SIZE, rtd->acp3x_base + reg_fifo_size);

sound/soc/amd/raven/pci-acp3x.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -45,23 +45,6 @@ static int acp3x_power_on(void __iomem *acp3x_base)
		return -ETIMEDOUT;
		}

		static int acp3x_power_off(void __iomem *acp3x_base)
		{
		u32 val;
		int timeout;

		rv_writel(ACP_PGFSM_CNTL_POWER_OFF_MASK,
		acp3x_base + mmACP_PGFSM_CONTROL);
		timeout = 0;
		while (++timeout < 500) {
		val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS);
		if ((val & ACP_PGFSM_STATUS_MASK) == ACP_POWERED_OFF)
		return 0;
		udelay(1);
		}
		return -ETIMEDOUT;
		}

		static int acp3x_reset(void __iomem *acp3x_base)
		{
		u32 val;
		@@ -115,12 +98,6 @@ static int acp3x_deinit(void __iomem *acp3x_base)
		pr_err("ACP3x reset failed\n");
		return ret;
		}
		/* power off */
		ret = acp3x_power_off(acp3x_base);
		if (ret) {
		pr_err("ACP3x power off failed\n");
		return ret;
		}
		return 0;
		}

Admin message