Commit 425f598e authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Vinod Koul
Browse files

ASoC: amd: ps: pass acp pci revision id as soundwire resource data 



Add acp_rev as structure member in acp pci driver private data structure
to store acp pci revision id and assign this variable to SoundWire resource
data acp_rev variable.

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20240924081846.1834612-5-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1bb50ead

sound/soc/amd/ps/acp63.h

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ struct sdw_dma_ring_buf_reg { 
 * @sdw_en_stat: flag set to true when any one of the SoundWire manager instance is enabled

 * @addr: pci ioremap address

 * @reg_range: ACP reigister range

 * @acp_rev: ACP PCI revision id

 * @sdw0-dma_intr_stat: DMA interrupt status array for SoundWire manager-SW0 instance

 * @sdw_dma_intr_stat: DMA interrupt status array for SoundWire manager-SW1 instance

 */
@@ -254,6 +255,7 @@ struct acp63_dev_data { 
	bool sdw_en_stat;

	u32 addr;

	u32 reg_range;

	u32 acp_rev;

	u16 sdw0_dma_intr_stat[ACP63_SDW0_DMA_MAX_STREAMS];

	u16 sdw1_dma_intr_stat[ACP63_SDW1_DMA_MAX_STREAMS];

};

sound/soc/amd/ps/pci-ps.c

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ static int amd_sdw_probe(struct device *dev) 
	sdw_res.acp_lock = &acp_data->acp_lock;

	sdw_res.count = acp_data->info.count;

	sdw_res.mmio_base = acp_data->acp63_base;

	sdw_res.acp_rev = acp_data->acp_rev;

	sdw_res.link_mask = acp_data->info.link_mask;

	ret = sdw_amd_probe(&sdw_res, &acp_data->sdw);

	if (ret)
@@ -576,6 +577,7 @@ static int snd_acp63_probe(struct pci_dev *pci, 
	}

	adata->addr = addr;

	adata->reg_range = ACP63_REG_END - ACP63_REG_START;

	adata->acp_rev = pci->revision;

	pci_set_master(pci);

	pci_set_drvdata(pci, adata);

	mutex_init(&adata->acp_lock);