fixup! ASoC: SOF: mediatek: Add mt8365 support

ujfalusi · ujfalusi · commit 632952df2819 · 2025-11-19T14:01:42.000+02:00
Add prefixes to avoid symbol duplication and future proof the code:

ld.lld: error: duplicate symbol: __cfi_adsp_clock_off
    ld.lld: error: duplicate symbol: __cfi_adsp_clock_on
    ld.lld: error: duplicate symbol: __cfi_sof_hifixdsp_boot_sequence
    ld.lld: error: duplicate symbol: __cfi_sof_hifixdsp_shutdown
    ld.lld: error: duplicate symbol: adsp_clock_off
    ld.lld: error: duplicate symbol: adsp_clock_on
    ld.lld: error: duplicate symbol: sof_hifixdsp_boot_sequence
    ld.lld: error: duplicate symbol: sof_hifixdsp_shutdown

Signed-off-by: Peter Ujfalusi &lt;peter.ujfalusi@linux.intel.com&gt;
diff --git a/sound/soc/sof/mediatek/mt8365/mt8365-clk.c b/sound/soc/sof/mediatek/mt8365/mt8365-clk.c
@@ -163,13 +163,13 @@ static int adsp_default_clk_init(struct snd_sof_dev *sdev, bool enable)
 	return 0;
 }
 
-int adsp_clock_on(struct snd_sof_dev *sdev)
+int mt8365_adsp_clock_on(struct snd_sof_dev *sdev)
 {
 	/* Open ADSP clock */
 	return adsp_default_clk_init(sdev, 1);
 }
 
-int adsp_clock_off(struct snd_sof_dev *sdev)
+int mt8365_adsp_clock_off(struct snd_sof_dev *sdev)
 {
 	/* Close ADSP clock */
 	return adsp_default_clk_init(sdev, 0);
diff --git a/sound/soc/sof/mediatek/mt8365/mt8365-clk.h b/sound/soc/sof/mediatek/mt8365/mt8365-clk.h
@@ -27,6 +27,6 @@ enum adsp_clk_id {
 };
 
 int mt8365_adsp_init_clock(struct snd_sof_dev *sdev);
-int adsp_clock_on(struct snd_sof_dev *sdev);
-int adsp_clock_off(struct snd_sof_dev *sdev);
+int mt8365_adsp_clock_on(struct snd_sof_dev *sdev);
+int mt8365_adsp_clock_off(struct snd_sof_dev *sdev);
 #endif
diff --git a/sound/soc/sof/mediatek/mt8365/mt8365-loader.c b/sound/soc/sof/mediatek/mt8365/mt8365-loader.c
@@ -11,7 +11,7 @@
 #include "mt8365.h"
 #include "../../ops.h"
 
-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
+void mt8365_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
 {
 	/* ADSP bootup base */
 	snd_sof_dsp_write(sdev, DSP_REG_BAR, DSP_ALTRESETVEC, boot_addr);
@@ -48,7 +48,7 @@ void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
 				ADSP_RUNSTALL, 0);
 }
 
-void sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)
+void mt8365_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)
 {
 	/* RUN_STALL pull high again to reset */
 	snd_sof_dsp_update_bits(sdev, DSP_REG_BAR, DSP_RESET_SW,
diff --git a/sound/soc/sof/mediatek/mt8365/mt8365.c b/sound/soc/sof/mediatek/mt8365/mt8365.c
@@ -270,7 +270,7 @@ static int adsp_memory_remap_init(struct device *dev, struct mtk_adsp_chip_info
 static int mt8365_run(struct snd_sof_dev *sdev)
 {
 	dev_dbg(sdev->dev, "HIFIxDSP boot from base : 0x%08X\n", SRAM_PHYS_BASE_FROM_DSP_VIEW);
-	sof_hifixdsp_boot_sequence(sdev, SRAM_PHYS_BASE_FROM_DSP_VIEW);
+	mt8365_sof_hifixdsp_boot_sequence(sdev, SRAM_PHYS_BASE_FROM_DSP_VIEW);
 
 	return 0;
 }
@@ -303,9 +303,9 @@ static int mt8365_dsp_probe(struct snd_sof_dev *sdev)
 		return -EINVAL;
 	}
 
-	ret = adsp_clock_on(sdev);
+	ret = mt8365_adsp_clock_on(sdev);
 	if (ret) {
-		dev_err(sdev->dev, "adsp_clock_on fail!\n");
+		dev_err(sdev->dev, "mt8365_adsp_clock_on fail!\n");
 		return -EINVAL;
 	}
 
@@ -372,7 +372,7 @@ static int mt8365_dsp_probe(struct snd_sof_dev *sdev)
 err_adsp_sram_power_off:
 	adsp_sram_power_on(&pdev->dev, false);
 exit_clk_disable:
-	adsp_clock_off(sdev);
+	mt8365_adsp_clock_off(sdev);
 
 	return ret;
 }
@@ -389,7 +389,7 @@ static void mt8365_dsp_remove(struct snd_sof_dev *sdev)
 
 	platform_device_unregister(priv->ipc_dev);
 	adsp_sram_power_on(&pdev->dev, false);
-	adsp_clock_off(sdev);
+	mt8365_adsp_clock_off(sdev);
 }
 
 static int mt8365_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
@@ -398,7 +398,7 @@ static int mt8365_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
 	int ret;
 
 	/* reset dsp */
-	sof_hifixdsp_shutdown(sdev);
+	mt8365_sof_hifixdsp_shutdown(sdev);
 
 	/* power down adsp sram */
 	ret = adsp_sram_power_on(&pdev->dev, false);
@@ -408,17 +408,17 @@ static int mt8365_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
 	}
 
 	/* turn off adsp clock */
-	return adsp_clock_off(sdev);
+	return mt8365_adsp_clock_off(sdev);
 }
 
 static int mt8365_dsp_resume(struct snd_sof_dev *sdev)
 {
 	int ret;
 
 	/* turn on adsp clock */
-	ret = adsp_clock_on(sdev);
+	ret = mt8365_adsp_clock_on(sdev);
 	if (ret) {
-		dev_err(sdev->dev, "adsp_clock_on fail!\n");
+		dev_err(sdev->dev, "mt8365_adsp_clock_on fail!\n");
 		return ret;
 	}
 
diff --git a/sound/soc/sof/mediatek/mt8365/mt8365.h b/sound/soc/sof/mediatek/mt8365/mt8365.h
@@ -165,6 +165,6 @@ struct snd_sof_dev;
 #define SUSPEND_DSP_IDLE_TIMEOUT_US		1000000	/* timeout to wait dsp idle, 1 sec */
 #define SUSPEND_DSP_IDLE_POLL_INTERVAL_US	500	/* 0.5 msec */
 
-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr);
-void sof_hifixdsp_shutdown(struct snd_sof_dev *sdev);
+void mt8365_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr);
+void mt8365_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -163,13 +163,13 @@ static int adsp_default_clk_init(struct snd_sof_dev *sdev, bool enable)`
`163`	`163`	`return 0;`
`164`	`164`	`}`
`165`	`165`
`166`		`-int adsp_clock_on(struct snd_sof_dev *sdev)`
	`166`	`+int mt8365_adsp_clock_on(struct snd_sof_dev *sdev)`
`167`	`167`	`{`
`168`	`168`	`/* Open ADSP clock */`
`169`	`169`	`return adsp_default_clk_init(sdev, 1);`
`170`	`170`	`}`
`171`	`171`
`172`		`-int adsp_clock_off(struct snd_sof_dev *sdev)`
	`172`	`+int mt8365_adsp_clock_off(struct snd_sof_dev *sdev)`
`173`	`173`	`{`
`174`	`174`	`/* Close ADSP clock */`
`175`	`175`	`return adsp_default_clk_init(sdev, 0);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#include "mt8365.h"`
`12`	`12`	`#include "../../ops.h"`
`13`	`13`
`14`		`-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)`
	`14`	`+void mt8365_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)`
`15`	`15`	`{`
`16`	`16`	`/* ADSP bootup base */`
`17`	`17`	`snd_sof_dsp_write(sdev, DSP_REG_BAR, DSP_ALTRESETVEC, boot_addr);`
`@@ -48,7 +48,7 @@ void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)`
`48`	`48`	`ADSP_RUNSTALL, 0);`
`49`	`49`	`}`
`50`	`50`
`51`		`-void sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)`
	`51`	`+void mt8365_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)`
`52`	`52`	`{`
`53`	`53`	`/* RUN_STALL pull high again to reset */`
`54`	`54`	`snd_sof_dsp_update_bits(sdev, DSP_REG_BAR, DSP_RESET_SW,`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ static int adsp_memory_remap_init(struct device *dev, struct mtk_adsp_chip_info`
`270`	`270`	`static int mt8365_run(struct snd_sof_dev *sdev)`
`271`	`271`	`{`
`272`	`272`	`dev_dbg(sdev->dev, "HIFIxDSP boot from base : 0x%08X\n", SRAM_PHYS_BASE_FROM_DSP_VIEW);`
`273`		`- sof_hifixdsp_boot_sequence(sdev, SRAM_PHYS_BASE_FROM_DSP_VIEW);`
	`273`	`+ mt8365_sof_hifixdsp_boot_sequence(sdev, SRAM_PHYS_BASE_FROM_DSP_VIEW);`
`274`	`274`
`275`	`275`	`return 0;`
`276`	`276`	`}`
`@@ -303,9 +303,9 @@ static int mt8365_dsp_probe(struct snd_sof_dev *sdev)`
`303`	`303`	`return -EINVAL;`
`304`	`304`	`}`
`305`	`305`
`306`		`- ret = adsp_clock_on(sdev);`
	`306`	`+ ret = mt8365_adsp_clock_on(sdev);`
`307`	`307`	`if (ret) {`
`308`		`- dev_err(sdev->dev, "adsp_clock_on fail!\n");`
	`308`	`+ dev_err(sdev->dev, "mt8365_adsp_clock_on fail!\n");`
`309`	`309`	`return -EINVAL;`
`310`	`310`	`}`
`311`	`311`
`@@ -372,7 +372,7 @@ static int mt8365_dsp_probe(struct snd_sof_dev *sdev)`
`372`	`372`	`err_adsp_sram_power_off:`
`373`	`373`	`adsp_sram_power_on(&pdev->dev, false);`
`374`	`374`	`exit_clk_disable:`
`375`		`- adsp_clock_off(sdev);`
	`375`	`+ mt8365_adsp_clock_off(sdev);`
`376`	`376`
`377`	`377`	`return ret;`
`378`	`378`	`}`
`@@ -389,7 +389,7 @@ static void mt8365_dsp_remove(struct snd_sof_dev *sdev)`
`389`	`389`
`390`	`390`	`platform_device_unregister(priv->ipc_dev);`
`391`	`391`	`adsp_sram_power_on(&pdev->dev, false);`
`392`		`- adsp_clock_off(sdev);`
	`392`	`+ mt8365_adsp_clock_off(sdev);`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`static int mt8365_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`@@ -398,7 +398,7 @@ static int mt8365_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`398`	`398`	`int ret;`
`399`	`399`
`400`	`400`	`/* reset dsp */`
`401`		`- sof_hifixdsp_shutdown(sdev);`
	`401`	`+ mt8365_sof_hifixdsp_shutdown(sdev);`
`402`	`402`
`403`	`403`	`/* power down adsp sram */`
`404`	`404`	`ret = adsp_sram_power_on(&pdev->dev, false);`
`@@ -408,17 +408,17 @@ static int mt8365_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`/* turn off adsp clock */`
`411`		`- return adsp_clock_off(sdev);`
	`411`	`+ return mt8365_adsp_clock_off(sdev);`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`static int mt8365_dsp_resume(struct snd_sof_dev *sdev)`
`415`	`415`	`{`
`416`	`416`	`int ret;`
`417`	`417`
`418`	`418`	`/* turn on adsp clock */`
`419`		`- ret = adsp_clock_on(sdev);`
	`419`	`+ ret = mt8365_adsp_clock_on(sdev);`
`420`	`420`	`if (ret) {`
`421`		`- dev_err(sdev->dev, "adsp_clock_on fail!\n");`
	`421`	`+ dev_err(sdev->dev, "mt8365_adsp_clock_on fail!\n");`
`422`	`422`	`return ret;`
`423`	`423`	`}`
`424`	`424`