History

ASoC: amd: 16bit resolution support for i2s sp instance

Moved 16bit resolution condition check for stoney platform to acp_hw_params.Depending upon substream required register value need to be programmed rather than enabling 16bit resolution support all time in acp init.

Vijendar Mukunda committed 8 years ago

Commit a37d48e1 parent 7928b2c2 files · +11 −7Browse files

Unified · Split

2 files
  1. sound/soc/amd/acp-pcm-dma.c +9 −7
  2. sound/soc/amd/acp.h +2 −0
sound/soc/amd/acp-pcm-dma.c+9−7
@@ -579,13 +579,6 @@ static int acp_init(void __iomem *acp_mmio, u32 asic_type) · 578 unmodified lines
579579 for (bank = 1; bank < 48; bank++)
580580 acp_set_sram_bank_state(acp_mmio, bank, false);
581581 }
582−
583− /* Stoney supports 16bit resolution */
584− if (asic_type == CHIP_STONEY) {
585− val = acp_reg_read(acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
586− val |= 0x03;
587− acp_reg_write(val, acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
588− }
589582 return 0;
590583 }
591584
@@ -774,6 +767,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, · 182 unmodified lines
774767 {
775768 int status;
776769 uint64_t size;
770+ u32 val = 0;
777771 struct page *pg;
778772 struct snd_pcm_runtime *runtime;
779773 struct audio_substream_data *rtd;
@@ -786,6 +780,14 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, · 6 unmodified lines
786780 if (WARN_ON(!rtd))
787781 return -EINVAL;
788782
783+ if (adata->asic_type == CHIP_STONEY) {
784+ val = acp_reg_read(adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
785+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
786+ val |= ACP_I2S_SP_16BIT_RESOLUTION_EN;
787+ else
788+ val |= ACP_I2S_MIC_16BIT_RESOLUTION_EN;
789+ acp_reg_write(val, adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
790+ }
789791 size = params_buffer_bytes(params);
790792 status = snd_pcm_lib_malloc_pages(substream, size);
791793 if (status < 0)
sound/soc/amd/acp.h+2−0
@@ -70,6 +70,8 @@ · 69 unmodified lines
7070 #define CAPTURE_END_DMA_DESCR_CH15 7
7171
7272 #define mmACP_I2S_16BIT_RESOLUTION_EN 0x5209
73+#define ACP_I2S_MIC_16BIT_RESOLUTION_EN 0x01
74+#define ACP_I2S_SP_16BIT_RESOLUTION_EN 0x02
7375 enum acp_dma_priority_level {
7476 /* 0x0 Specifies the DMA channel is given normal priority */
7577 ACP_DMA_PRIORITY_LEVEL_NORMAL = 0x0,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t