github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: amd: acp: acp63: Use AMD_NODE

Browse Source 
All consumers of SMN in the kernel should be doing it through the
functions provided by AMD_NODE.

Stop using the local SMN read/write symbols and switch to the AMD_NODE
provided ones.

Tested by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/20250217231747.1656228-5-superm1@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mario Limonciello 2025-02-17 17:17:44 -06:00 committed by Mark Brown
parent 135c6af1ca
commit 8f96953714
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/amd/acp/Kconfig
View File

@ -69,6 +69,7 @@ config SND_AMD_ASOC_ACP63
tristate "AMD ACP ASOC ACP6.3 Support"
depends on X86 && PCI
depends on ACPI
depends on AMD_NODE
select SND_SOC_AMD_ACP_PCM
select SND_SOC_AMD_ACP_I2S
select SND_SOC_AMD_ACP_PDM

55
sound/soc/amd/acp/acp63.c
View File

@ -20,6 +20,9 @@
#include <linux/dma-mapping.h>
#include <linux/pm_runtime.h>
#include <linux/pci.h>
#include <asm/amd_node.h>
#include "amd.h"
#include "acp-mach.h"
#include "../mach-config.h"
@ -160,37 +163,53 @@ static struct snd_soc_dai_driver acp63_dai[] = {
static int acp63_i2s_master_clock_generate(struct acp_dev_data *adata)
{
int rc;
u32 data;
union clk_pll_req_no clk_pll;
struct pci_dev *smn_dev;
smn_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x14E8, NULL);
if (!smn_dev)
return -ENODEV;
/* Clk5 pll register values to get mclk as 196.6MHz*/
clk_pll.bits.fb_mult_int = 0x31;
clk_pll.bits.pll_spine_div = 0;
clk_pll.bits.gb_mult_frac = 0x26E9;
data = smn_read(smn_dev, CLK_PLL_PWR_REQ_N0);
smn_write(smn_dev, CLK_PLL_PWR_REQ_N0, data | PLL_AUTO_STOP_REQ);
rc = amd_smn_read(0, CLK_PLL_PWR_REQ_N0, &data);
if (rc)
return rc;
rc = amd_smn_write(0, CLK_PLL_PWR_REQ_N0, data | PLL_AUTO_STOP_REQ);
if (rc)
return rc;
data = smn_read(smn_dev, CLK_SPLL_FIELD_2_N0);
if (data & PLL_FRANCE_EN)
smn_write(smn_dev, CLK_SPLL_FIELD_2_N0, data | PLL_FRANCE_EN);
rc = amd_smn_read(0, CLK_SPLL_FIELD_2_N0, &data);
if (rc)
return rc;
if (data & PLL_FRANCE_EN) {
rc = amd_smn_write(0, CLK_SPLL_FIELD_2_N0, data | PLL_FRANCE_EN);
if (rc)
return rc;
}
smn_write(smn_dev, CLK_PLL_REQ_N0, clk_pll.clk_pll_req_no_reg);
rc = amd_smn_write(0, CLK_PLL_REQ_N0, clk_pll.clk_pll_req_no_reg);
if (rc)
return rc;
data = smn_read(smn_dev, CLK_PLL_PWR_REQ_N0);
smn_write(smn_dev, CLK_PLL_PWR_REQ_N0, data | PLL_AUTO_START_REQ);
rc = amd_smn_read(0, CLK_PLL_PWR_REQ_N0, &data);
if (rc)
return rc;
rc = amd_smn_write(0, CLK_PLL_PWR_REQ_N0, data | PLL_AUTO_START_REQ);
if (rc)
return rc;
data = smn_read(smn_dev, CLK_DFSBYPASS_CONTR);
smn_write(smn_dev, CLK_DFSBYPASS_CONTR, data | EXIT_DPF_BYPASS_0);
smn_write(smn_dev, CLK_DFSBYPASS_CONTR, data | EXIT_DPF_BYPASS_1);
rc = amd_smn_read(0, CLK_DFSBYPASS_CONTR, &data);
if (rc)
return rc;
rc = amd_smn_write(0, CLK_DFSBYPASS_CONTR, data | EXIT_DPF_BYPASS_0);
if (rc)
return rc;
rc = amd_smn_write(0, CLK_DFSBYPASS_CONTR, data | EXIT_DPF_BYPASS_1);
if (rc)
return rc;
smn_write(smn_dev, CLK_DFS_CNTL_N0, CLK0_DIVIDER);
return 0;
return amd_smn_write(0, CLK_DFS_CNTL_N0, CLK0_DIVIDER);
}
static int acp63_audio_probe(struct platform_device *pdev)

1
sound/soc/sof/amd/pci-acp63.c
View File

@ -28,7 +28,6 @@
#define ACP6x_REG_END 0x125C000
static const struct sof_amd_acp_desc acp63_chip_info = {
.host_bridge_id = HOST_BRIDGE_ACP63,
.pgfsm_base = ACP6X_PGFSM_BASE,
.ext_intr_enb = ACP6X_EXTERNAL_INTR_ENB,
.ext_intr_cntl = ACP6X_EXTERNAL_INTR_CNTL,