Unverified Commit 8f969537 authored by Mario Limonciello's avatar Mario Limonciello Committed by Mark Brown
Browse files

ASoC: amd: acp: acp63: Use AMD_NODE 



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: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/20250217231747.1656228-5-superm1@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 135c6af1

sound/soc/amd/acp/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/amd/acp/acp63.c

+41 −22
Original line number Diff line number Diff line
@@ -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);



	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);



	smn_write(smn_dev, CLK_PLL_REQ_N0, clk_pll.clk_pll_req_no_reg);



	data = smn_read(smn_dev, CLK_PLL_PWR_REQ_N0);

	smn_write(smn_dev, CLK_PLL_PWR_REQ_N0, data | PLL_AUTO_START_REQ);



	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_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;



	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_DFS_CNTL_N0, CLK0_DIVIDER);

	return 0;

	rc = amd_smn_write(0, CLK_PLL_REQ_N0, clk_pll.clk_pll_req_no_reg);

	if (rc)

		return rc;



	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;



	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;



	return amd_smn_write(0, CLK_DFS_CNTL_N0, CLK0_DIVIDER);

}



static int acp63_audio_probe(struct platform_device *pdev)

sound/soc/sof/amd/pci-acp63.c

+0 −1
Original line number Diff line number Diff line
@@ -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,