Skip to content

Commit 1547d7b

Browse files
vijendarmukundagregkh
authored andcommitted
ASoC: amd: acp: add ZSC control register programming sequence
commit c35fad6 upstream. Add ZSC Control register programming sequence for ACP D0 and D3 state transitions for ACP7.0 onwards. This will allow ACP to enter low power state when ACP enters D3 state. When ACP enters D0 State, ZSC control should be disabled. Tested-by: Leo Li <sunpeng.li@amd.com> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Link: https://patch.msgid.link/20240807085154.1987681-1-Vijendar.Mukunda@amd.com Signed-off-by: Mark Brown <broonie@kernel.org> Cc: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2b4545f commit 1547d7b

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

sound/soc/amd/acp/acp-legacy-common.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@ int acp_init(struct acp_chip_info *chip)
321321
pr_err("ACP reset failed\n");
322322
return ret;
323323
}
324+
if (chip->acp_rev >= ACP70_DEV)
325+
writel(0, chip->base + ACP_ZSC_DSP_CTRL);
324326
return 0;
325327
}
326328
EXPORT_SYMBOL_NS_GPL(acp_init, SND_SOC_ACP_COMMON);
@@ -336,6 +338,9 @@ int acp_deinit(struct acp_chip_info *chip)
336338

337339
if (chip->acp_rev != ACP70_DEV)
338340
writel(0, chip->base + ACP_CONTROL);
341+
342+
if (chip->acp_rev >= ACP70_DEV)
343+
writel(0x01, chip->base + ACP_ZSC_DSP_CTRL);
339344
return 0;
340345
}
341346
EXPORT_SYMBOL_NS_GPL(acp_deinit, SND_SOC_ACP_COMMON);

sound/soc/amd/acp/amd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
#define ACP70_PGFSM_CONTROL ACP6X_PGFSM_CONTROL
104104
#define ACP70_PGFSM_STATUS ACP6X_PGFSM_STATUS
105105

106+
#define ACP_ZSC_DSP_CTRL 0x0001014
107+
#define ACP_ZSC_STS 0x0001018
106108
#define ACP_SOFT_RST_DONE_MASK 0x00010001
107109

108110
#define ACP_PGFSM_CNTL_POWER_ON_MASK 0xffffffff

0 commit comments

Comments
 (0)