Unverified Commit d08220b6 authored by Venkata Prasad Potturu's avatar Venkata Prasad Potturu Committed by Mark Brown
Browse files

ASoC: amd: acp: Refactor acp63 platform resource structure 



Refactor acp63 platform resource private structure to amd.h
header file.

Signed-off-by: default avatarVenkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://patch.msgid.link/20250310183201.11979-12-venkataprasad.potturu@amd.com


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

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

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id 
		break;

	case 0x63:

		chip->name = "acp_asoc_acp63";

		chip->rsrc = &acp63_rsrc;

		chip->acp_hw_ops_init = acp63_hw_ops_init;

		chip->machines = snd_soc_acpi_amd_acp63_acp_machines;

		break;

sound/soc/amd/acp/acp63.c

+1 −12
Original line number Diff line number Diff line
@@ -52,16 +52,6 @@ union clk_pll_req_no { 
	u32 clk_pll_req_no_reg;

};



static struct acp_resource rsrc = {

	.offset = 0,

	.no_of_ctrls = 2,

	.irqp_used = 1,

	.soc_mclk = true,

	.irq_reg_offset = 0x1a00,

	.scratch_reg_offset = 0x12800,

	.sram_pte_offset = 0x03802800,

};



static struct snd_soc_dai_driver acp63_dai[] = {

{

	.name = "acp-i2s-sp",
@@ -222,11 +212,10 @@ static int acp63_audio_probe(struct platform_device *pdev) 
	}



	chip->dev = dev;

	chip->rsrc = &rsrc;

	chip->dai_driver = acp63_dai;

	chip->num_dai = ARRAY_SIZE(acp63_dai);



	if (chip->is_i2s_config && rsrc.soc_mclk) {

	if (chip->is_i2s_config && chip->rsrc->soc_mclk) {

		ret = acp63_i2s_master_clock_generate(chip);

		if (ret)

			return ret;

sound/soc/amd/acp/amd.h

+10 −0
Original line number Diff line number Diff line
@@ -238,6 +238,16 @@ enum acp_config { 
	ACP_CONFIG_20,

};



struct acp_resource acp63_rsrc = {

	.offset = 0,

	.no_of_ctrls = 2,

	.irqp_used = 1,

	.soc_mclk = true,

	.irq_reg_offset = 0x1a00,

	.scratch_reg_offset = 0x12800,

	.sram_pte_offset = 0x03802800,

};



struct acp_resource acp70_rsrc = {

	.offset = 0,

	.no_of_ctrls = 2,