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

ASoC: amd: acp: Fix acp_resource duplicate symbol error 



Fix acp_resource structure duplicate defination error by adding
export symbol and extern keyword in header file.

ld.lld: error: duplicate symbol: acp63_rsrc
ld.lld: error: duplicate symbol: acp70_rsrc

Fixes: f8b4f3f5 ("ASoC: amd: acp: Refactor acp70 platform resource structure")

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503160801.yExt0K2E-lkp@intel.com/


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


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

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

+43 −0
Original line number Diff line number Diff line
@@ -24,6 +24,49 @@ 
#define ACP63_PDM_ADDR		0x02

#define ACP70_PDM_ADDR		0x02



struct acp_resource rn_rsrc = {

	.offset = 20,

	.no_of_ctrls = 1,

	.irqp_used = 0,

	.irq_reg_offset = 0x1800,

	.scratch_reg_offset = 0x12800,

	.sram_pte_offset = 0x02052800,

};

EXPORT_SYMBOL_NS_GPL(rn_rsrc, "SND_SOC_ACP_COMMON");



struct acp_resource rmb_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,

};

EXPORT_SYMBOL_NS_GPL(rmb_rsrc, "SND_SOC_ACP_COMMON");



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,

};

EXPORT_SYMBOL_NS_GPL(acp63_rsrc, "SND_SOC_ACP_COMMON");



struct acp_resource acp70_rsrc = {

	.offset = 0,

	.no_of_ctrls = 2,

	.irqp_used = 1,

	.soc_mclk = true,

	.irq_reg_offset = 0x1a00,

	.scratch_reg_offset = 0x10000,

	.sram_pte_offset = 0x03800000,

};

EXPORT_SYMBOL_NS_GPL(acp70_rsrc, "SND_SOC_ACP_COMMON");



const struct snd_acp_hw_ops acp_common_hw_ops = {

	/* ACP hardware initilizations */

	.acp_init = acp_init,

sound/soc/amd/acp/amd.h

+4 −38
Original line number Diff line number Diff line
@@ -238,44 +238,10 @@ enum acp_config { 
	ACP_CONFIG_20,

};



struct acp_resource rn_rsrc = {

	.offset = 20,

	.no_of_ctrls = 1,

	.irqp_used = 0,

	.irq_reg_offset = 0x1800,

	.scratch_reg_offset = 0x12800,

	.sram_pte_offset = 0x02052800,

};



struct acp_resource rmb_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 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,

	.irqp_used = 1,

	.soc_mclk = true,

	.irq_reg_offset = 0x1a00,

	.scratch_reg_offset = 0x10000,

	.sram_pte_offset = 0x03800000,

};

extern struct acp_resource rn_rsrc;

extern struct acp_resource rmb_rsrc;

extern struct acp_resource acp63_rsrc;

extern struct acp_resource acp70_rsrc;



extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines;

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_acp_machines;