Unverified Commit 5bbb3913 authored by Mark Brown's avatar Mark Brown
Browse files

Add audio support for acp7.2 platform 

Merge series from Venkata Prasad Potturu <venkataprasad.potturu@amd.com>:

This patch series is to add legacy and sof audio support
for acp7.2 platform.
parents 1b03391d 1c4c768d

sound/soc/amd/acp/acp-sdw-legacy-mach.c

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
			break;

		case ACP70_PCI_REV:

		case ACP71_PCI_REV:

		case ACP72_PCI_REV:

			ret = get_acp70_cpu_pin_id(ffs(soc_end->link_mask - 1),

						   *be_id, &cpu_pin_id, dev);

			if (ret)
@@ -264,6 +265,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card, 
	case ACP63_PCI_REV:

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		sdw_platform_component->name = "amd_ps_sdw_dma.0";

		break;

	default:
@@ -311,6 +313,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card, 
	case ACP63_PCI_REV:

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		pdm_cpu->name = "acp_ps_pdm_dma.0";

		pdm_platform->name = "acp_ps_pdm_dma.0";

		break;

sound/soc/amd/acp/acp-sdw-sof-mach.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
			break;

		case ACP70_PCI_REV:

		case ACP71_PCI_REV:

		case ACP72_PCI_REV:

			ret = get_acp70_cpu_pin_id(ffs(sof_end->link_mask - 1),

						   *be_id, &cpu_pin_id, dev);

			if (ret)

sound/soc/amd/acp/soc_amd_sdw_common.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#define ACP63_PCI_REV			0x63

#define ACP70_PCI_REV			0x70

#define ACP71_PCI_REV			0x71

#define ACP72_PCI_REV			0x72



#define SOC_JACK_JDSRC(quirk)		((quirk) & GENMASK(3, 0))

#define ASOC_SDW_FOUR_SPK		BIT(4)

#define ASOC_SDW_ACP_DMIC		BIT(5)

sound/soc/amd/ps/acp63.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define ACP63_PCI_REV		0x63

#define ACP70_PCI_REV		0x70

#define ACP71_PCI_REV		0x71

#define ACP72_PCI_REV		0x72



#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK	0x00010001

#define ACP63_PGFSM_CNTL_POWER_ON_MASK	1

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

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static short int check_and_handle_sdw_dma_irq(struct acp63_dev_data *adata, u32 
					break;

				case ACP70_PCI_REV:

				case ACP71_PCI_REV:

				case ACP72_PCI_REV:

					adata->acp70_sdw0_dma_intr_stat[stream_id] = 1;

					break;

				}
@@ -141,6 +142,7 @@ static short int check_and_handle_sdw_dma_irq(struct acp63_dev_data *adata, u32 
		break;

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		if (ext_intr_stat1 & ACP70_P1_SDW_DMA_IRQ_MASK) {

			for (index = ACP70_P1_AUDIO2_RX_THRESHOLD;

			     index <= ACP70_P1_AUDIO0_TX_THRESHOLD; index++) {
@@ -552,6 +554,7 @@ static int acp_hw_init_ops(struct acp63_dev_data *adata, struct pci_dev *pci) 
		break;

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		acp70_hw_init_ops(adata->hw_ops);

		break;

	default:
@@ -581,6 +584,7 @@ static int snd_acp63_probe(struct pci_dev *pci, 
	case ACP63_PCI_REV:

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		break;

	default:

		dev_dbg(&pci->dev, "acp63/acp70/acp71 pci device not found\n");