Skip to content

Commit 09dc803

Browse files
Venkata-Prasad-Potturubroonie
authored andcommitted
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: f8b4f3f ("ASoC: amd: acp: Refactor acp70 platform resource structure") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Signed-off-by: Venkata Prasad Potturu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 9c2c0ef commit 09dc803

File tree

2 files changed

+47
-38
lines changed

2 files changed

+47
-38
lines changed

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,49 @@
2424
#define ACP63_PDM_ADDR 0x02
2525
#define ACP70_PDM_ADDR 0x02
2626

27+
struct acp_resource rn_rsrc = {
28+
.offset = 20,
29+
.no_of_ctrls = 1,
30+
.irqp_used = 0,
31+
.irq_reg_offset = 0x1800,
32+
.scratch_reg_offset = 0x12800,
33+
.sram_pte_offset = 0x02052800,
34+
};
35+
EXPORT_SYMBOL_NS_GPL(rn_rsrc, "SND_SOC_ACP_COMMON");
36+
37+
struct acp_resource rmb_rsrc = {
38+
.offset = 0,
39+
.no_of_ctrls = 2,
40+
.irqp_used = 1,
41+
.soc_mclk = true,
42+
.irq_reg_offset = 0x1a00,
43+
.scratch_reg_offset = 0x12800,
44+
.sram_pte_offset = 0x03802800,
45+
};
46+
EXPORT_SYMBOL_NS_GPL(rmb_rsrc, "SND_SOC_ACP_COMMON");
47+
48+
struct acp_resource acp63_rsrc = {
49+
.offset = 0,
50+
.no_of_ctrls = 2,
51+
.irqp_used = 1,
52+
.soc_mclk = true,
53+
.irq_reg_offset = 0x1a00,
54+
.scratch_reg_offset = 0x12800,
55+
.sram_pte_offset = 0x03802800,
56+
};
57+
EXPORT_SYMBOL_NS_GPL(acp63_rsrc, "SND_SOC_ACP_COMMON");
58+
59+
struct acp_resource acp70_rsrc = {
60+
.offset = 0,
61+
.no_of_ctrls = 2,
62+
.irqp_used = 1,
63+
.soc_mclk = true,
64+
.irq_reg_offset = 0x1a00,
65+
.scratch_reg_offset = 0x10000,
66+
.sram_pte_offset = 0x03800000,
67+
};
68+
EXPORT_SYMBOL_NS_GPL(acp70_rsrc, "SND_SOC_ACP_COMMON");
69+
2770
const struct snd_acp_hw_ops acp_common_hw_ops = {
2871
/* ACP hardware initilizations */
2972
.acp_init = acp_init,

sound/soc/amd/acp/amd.h

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -238,44 +238,10 @@ enum acp_config {
238238
ACP_CONFIG_20,
239239
};
240240

241-
struct acp_resource rn_rsrc = {
242-
.offset = 20,
243-
.no_of_ctrls = 1,
244-
.irqp_used = 0,
245-
.irq_reg_offset = 0x1800,
246-
.scratch_reg_offset = 0x12800,
247-
.sram_pte_offset = 0x02052800,
248-
};
249-
250-
struct acp_resource rmb_rsrc = {
251-
.offset = 0,
252-
.no_of_ctrls = 2,
253-
.irqp_used = 1,
254-
.soc_mclk = true,
255-
.irq_reg_offset = 0x1a00,
256-
.scratch_reg_offset = 0x12800,
257-
.sram_pte_offset = 0x03802800,
258-
};
259-
260-
struct acp_resource acp63_rsrc = {
261-
.offset = 0,
262-
.no_of_ctrls = 2,
263-
.irqp_used = 1,
264-
.soc_mclk = true,
265-
.irq_reg_offset = 0x1a00,
266-
.scratch_reg_offset = 0x12800,
267-
.sram_pte_offset = 0x03802800,
268-
};
269-
270-
struct acp_resource acp70_rsrc = {
271-
.offset = 0,
272-
.no_of_ctrls = 2,
273-
.irqp_used = 1,
274-
.soc_mclk = true,
275-
.irq_reg_offset = 0x1a00,
276-
.scratch_reg_offset = 0x10000,
277-
.sram_pte_offset = 0x03800000,
278-
};
241+
extern struct acp_resource rn_rsrc;
242+
extern struct acp_resource rmb_rsrc;
243+
extern struct acp_resource acp63_rsrc;
244+
extern struct acp_resource acp70_rsrc;
279245

280246
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines;
281247
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_acp_machines;

0 commit comments

Comments
 (0)