| Message ID | 20230626105356.2580125-1-Vijendar.Mukunda@amd.com |
|---|---|
| State | Accepted |
| Commit | 7beda6a256ed10e74dc00fcd0fc8da0ad8fea78d |
| Headers | show |
| Series | [1/6] ASoC: amd: ps: add comments for DMA irq bits mapping | expand |
On Mon, 26 Jun 2023 16:23:49 +0530, Vijendar Mukunda wrote: > Add comments for DMA stream id and IRQ bit mapping in > ACP_EXTERNAL_CNTL & ACP_EXTERNAL_CNTL1 registers for > SDW0 and SDW1 manager instances. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/6] ASoC: amd: ps: add comments for DMA irq bits mapping commit: 7beda6a256ed10e74dc00fcd0fc8da0ad8fea78d [2/6] ASoC: amd: ps: add fix for dma irq mask for rx streams for SDW0 instance commit: 322a163ea6a38f63555d824c5b66c7df5a595c2d [3/6] ASoC: amd: ps: fix for position register set for AUDIO0 RX stream commit: f15f6b294dde506bd4902db3262e9b4ab7e9e5a9 [4/6] ASoC: amd: ps: add comments for DMA register mapping commit: 46b50e514b191ae15789cccabace5b6040c9278e [5/6] ASoC: amd: ps: fix byte count return value for invalid SoundWire manager instance commit: 68a653ab864ccf7874fe622f3af20fe7345c39be [6/6] ASoC: amd: acp: fix for invalid dai id handling in acp_get_byte_count() commit: 85aeab362201cf52c34cd429e4f6c75a0b42f9a3 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h index e96e6dc9d90f..733a16e23d32 100644 --- a/sound/soc/amd/ps/acp63.h +++ b/sound/soc/amd/ps/acp63.h @@ -116,8 +116,28 @@ #define ACP63_SDW0_DMA_MAX_STREAMS 6 #define ACP63_SDW1_DMA_MAX_STREAMS 2 #define ACP_P1_AUDIO_TX_THRESHOLD 6 + +/* + * Below entries describes SDW0 instance DMA stream id and DMA irq bit mapping + * in ACP_EXTENAL_INTR_CNTL register. + * Stream id IRQ Bit + * 0 (SDW0_AUDIO0_TX) 28 + * 1 (SDW0_AUDIO1_TX) 26 + * 2 (SDW0_AUDIO2_TX) 24 + * 3 (SDW0_AUDIO0_RX) 27 + * 4 (SDW0_AUDIO1_RX) 25 + * 5 (SDW0_AUDIO2_RX) 23 + */ #define SDW0_DMA_TX_IRQ_MASK(i) (ACP_AUDIO0_TX_THRESHOLD - (2 * (i))) #define SDW0_DMA_RX_IRQ_MASK(i) (ACP_AUDIO0_RX_THRESHOLD - (2 * (i))) + +/* + * Below entries describes SDW1 instance DMA stream id and DMA irq bit mapping + * in ACP_EXTENAL_INTR_CNTL1 register. + * Stream id IRQ Bit + * 0 (SDW1_AUDIO1_TX) 6 + * 1 (SDW1_AUDIO1_RX) 5 + */ #define SDW1_DMA_IRQ_MASK(i) (ACP_P1_AUDIO_TX_THRESHOLD - (i)) #define ACP_DELAY_US 5
Add comments for DMA stream id and IRQ bit mapping in ACP_EXTERNAL_CNTL & ACP_EXTERNAL_CNTL1 registers for SDW0 and SDW1 manager instances. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> --- sound/soc/amd/ps/acp63.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)