Skip to content

Commit cc489cc

Browse files
vijendarmukundabroonie
authored andcommitted
ASoC: SOF: amd: enable ACP_PME_EN register for ACP7.0 & ACP7.1 platforms
As per design flow for ACP7.0 & ACP7.1 platforms, enable ACP_PME_EN register for below scenarios. 1. During acp init sequence 2. During resume sequence for SoundWire ClockStop power mode. Signed-off-by: Vijendar Mukunda <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Reviewed-by: Bard Liao <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 8cc69ec commit cc489cc

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

sound/soc/sof/amd/acp-dsp-offset.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,5 @@
130130

131131
#define ACP_SW0_EN 0x3000
132132
#define ACP_SW1_EN 0x3C00
133+
#define ACP70_PME_EN 0x1400
133134
#endif

sound/soc/sof/amd/acp.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,11 @@ static int acp_dsp_reset(struct snd_sof_dev *sdev)
570570

571571
static int acp_init(struct snd_sof_dev *sdev)
572572
{
573+
struct acp_dev_data *acp_data;
573574
int ret;
574575

575576
/* power on */
577+
acp_data = sdev->pdata->hw_pdata;
576578
ret = acp_power_on(sdev);
577579
if (ret) {
578580
dev_err(sdev->dev, "ACP power on failed\n");
@@ -581,7 +583,16 @@ static int acp_init(struct snd_sof_dev *sdev)
581583

582584
snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_CONTROL, 0x01);
583585
/* Reset */
584-
return acp_reset(sdev);
586+
ret = acp_reset(sdev);
587+
if (ret)
588+
return ret;
589+
switch (acp_data->pci_rev) {
590+
case ACP70_PCI_ID:
591+
case ACP71_PCI_ID:
592+
snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP70_PME_EN, 1);
593+
break;
594+
}
595+
return 0;
585596
}
586597

587598
static bool check_acp_sdw_enable_status(struct snd_sof_dev *sdev)
@@ -646,6 +657,12 @@ int amd_sof_acp_resume(struct snd_sof_dev *sdev)
646657
}
647658
return acp_memory_init(sdev);
648659
}
660+
switch (acp_data->pci_rev) {
661+
case ACP70_PCI_ID:
662+
case ACP71_PCI_ID:
663+
snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP70_PME_EN, 1);
664+
break;
665+
}
649666

650667
return acp_dsp_reset(sdev);
651668
}

0 commit comments

Comments
 (0)