ASoC: SOF: mediatek: mt8195: Add prefixes to avoid duplicate symbols

ujfalusi · ujfalusi · commit d3741c24e014 · 2025-11-19T14:01:42.000+02:00
Follow the example of mt8186 and add prefixes to functions to future
proof the code.

Signed-off-by: Peter Ujfalusi &lt;peter.ujfalusi@linux.intel.com&gt;
diff --git a/sound/soc/sof/mediatek/mt8195/mt8195-clk.c b/sound/soc/sof/mediatek/mt8195/mt8195-clk.c
@@ -151,13 +151,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 mt8195_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 mt8195_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/mt8195/mt8195-clk.h b/sound/soc/sof/mediatek/mt8195/mt8195-clk.h
@@ -23,6 +23,6 @@ enum adsp_clk_id {
 };
 
 int mt8195_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 mt8195_adsp_clock_on(struct snd_sof_dev *sdev);
+int mt8195_adsp_clock_off(struct snd_sof_dev *sdev);
 #endif
diff --git a/sound/soc/sof/mediatek/mt8195/mt8195-loader.c b/sound/soc/sof/mediatek/mt8195/mt8195-loader.c
@@ -10,7 +10,7 @@
 #include "mt8195.h"
 #include "../../ops.h"
 
-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
+void mt8195_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);
@@ -47,7 +47,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 mt8195_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/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c
@@ -167,7 +167,7 @@ static int mt8195_run(struct snd_sof_dev *sdev)
 
 	adsp_bootup_addr = SRAM_PHYS_BASE_FROM_DSP_VIEW;
 	dev_dbg(sdev->dev, "HIFIxDSP boot from base : 0x%08X\n", adsp_bootup_addr);
-	sof_hifixdsp_boot_sequence(sdev, adsp_bootup_addr);
+	mt8195_sof_hifixdsp_boot_sequence(sdev, adsp_bootup_addr);
 
 	return 0;
 }
@@ -200,9 +200,9 @@ static int mt8195_dsp_probe(struct snd_sof_dev *sdev)
 		return -EINVAL;
 	}
 
-	ret = adsp_clock_on(sdev);
+	ret = mt8195_adsp_clock_on(sdev);
 	if (ret) {
-		dev_err(sdev->dev, "adsp_clock_on fail!\n");
+		dev_err(sdev->dev, "mt8195_adsp_clock_on fail!\n");
 		return -EINVAL;
 	}
 
@@ -275,7 +275,7 @@ static int mt8195_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);
+	mt8195_adsp_clock_off(sdev);
 
 	return ret;
 }
@@ -292,7 +292,7 @@ static void mt8195_dsp_remove(struct snd_sof_dev *sdev)
 
 	platform_device_unregister(priv->ipc_dev);
 	adsp_sram_power_on(&pdev->dev, false);
-	adsp_clock_off(sdev);
+	mt8195_adsp_clock_off(sdev);
 }
 
 static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
@@ -314,7 +314,7 @@ static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
 	}
 
 	/* stall and reset dsp */
-	sof_hifixdsp_shutdown(sdev);
+	mt8195_sof_hifixdsp_shutdown(sdev);
 
 	/* power down adsp sram */
 	ret = adsp_sram_power_on(&pdev->dev, false);
@@ -324,17 +324,17 @@ static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
 	}
 
 	/* turn off adsp clock */
-	return adsp_clock_off(sdev);
+	return mt8195_adsp_clock_off(sdev);
 }
 
 static int mt8195_dsp_resume(struct snd_sof_dev *sdev)
 {
 	int ret;
 
 	/* turn on adsp clock */
-	ret = adsp_clock_on(sdev);
+	ret = mt8195_adsp_clock_on(sdev);
 	if (ret) {
-		dev_err(sdev->dev, "adsp_clock_on fail!\n");
+		dev_err(sdev->dev, "mt8195_adsp_clock_on fail!\n");
 		return ret;
 	}
 
diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.h b/sound/soc/sof/mediatek/mt8195/mt8195.h
@@ -156,6 +156,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 mt8195_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr);
+void mt8195_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,13 @@ static int adsp_default_clk_init(struct snd_sof_dev *sdev, bool enable)`
`151`	`151`	`return 0;`
`152`	`152`	`}`
`153`	`153`
`154`		`-int adsp_clock_on(struct snd_sof_dev *sdev)`
	`154`	`+int mt8195_adsp_clock_on(struct snd_sof_dev *sdev)`
`155`	`155`	`{`
`156`	`156`	`/* Open ADSP clock */`
`157`	`157`	`return adsp_default_clk_init(sdev, 1);`
`158`	`158`	`}`
`159`	`159`
`160`		`-int adsp_clock_off(struct snd_sof_dev *sdev)`
	`160`	`+int mt8195_adsp_clock_off(struct snd_sof_dev *sdev)`
`161`	`161`	`{`
`162`	`162`	`/* Close ADSP clock */`
`163`	`163`	`return adsp_default_clk_init(sdev, 0);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#include "mt8195.h"`
`11`	`11`	`#include "../../ops.h"`
`12`	`12`
`13`		`-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)`
	`13`	`+void mt8195_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)`
`14`	`14`	`{`
`15`	`15`	`/* ADSP bootup base */`
`16`	`16`	`snd_sof_dsp_write(sdev, DSP_REG_BAR, DSP_ALTRESETVEC, boot_addr);`
`@@ -47,7 +47,7 @@ void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)`
`47`	`47`	`ADSP_RUNSTALL, 0);`
`48`	`48`	`}`
`49`	`49`
`50`		`-void sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)`
	`50`	`+void mt8195_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)`
`51`	`51`	`{`
`52`	`52`	`/* RUN_STALL pull high again to reset */`
`53`	`53`	`snd_sof_dsp_update_bits(sdev, DSP_REG_BAR, DSP_RESET_SW,`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ static int mt8195_run(struct snd_sof_dev *sdev)`
`167`	`167`
`168`	`168`	`adsp_bootup_addr = SRAM_PHYS_BASE_FROM_DSP_VIEW;`
`169`	`169`	`dev_dbg(sdev->dev, "HIFIxDSP boot from base : 0x%08X\n", adsp_bootup_addr);`
`170`		`- sof_hifixdsp_boot_sequence(sdev, adsp_bootup_addr);`
	`170`	`+ mt8195_sof_hifixdsp_boot_sequence(sdev, adsp_bootup_addr);`
`171`	`171`
`172`	`172`	`return 0;`
`173`	`173`	`}`
`@@ -200,9 +200,9 @@ static int mt8195_dsp_probe(struct snd_sof_dev *sdev)`
`200`	`200`	`return -EINVAL;`
`201`	`201`	`}`
`202`	`202`
`203`		`- ret = adsp_clock_on(sdev);`
	`203`	`+ ret = mt8195_adsp_clock_on(sdev);`
`204`	`204`	`if (ret) {`
`205`		`- dev_err(sdev->dev, "adsp_clock_on fail!\n");`
	`205`	`+ dev_err(sdev->dev, "mt8195_adsp_clock_on fail!\n");`
`206`	`206`	`return -EINVAL;`
`207`	`207`	`}`
`208`	`208`
`@@ -275,7 +275,7 @@ static int mt8195_dsp_probe(struct snd_sof_dev *sdev)`
`275`	`275`	`err_adsp_sram_power_off:`
`276`	`276`	`adsp_sram_power_on(&pdev->dev, false);`
`277`	`277`	`exit_clk_disable:`
`278`		`- adsp_clock_off(sdev);`
	`278`	`+ mt8195_adsp_clock_off(sdev);`
`279`	`279`
`280`	`280`	`return ret;`
`281`	`281`	`}`
`@@ -292,7 +292,7 @@ static void mt8195_dsp_remove(struct snd_sof_dev *sdev)`
`292`	`292`
`293`	`293`	`platform_device_unregister(priv->ipc_dev);`
`294`	`294`	`adsp_sram_power_on(&pdev->dev, false);`
`295`		`- adsp_clock_off(sdev);`
	`295`	`+ mt8195_adsp_clock_off(sdev);`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`@@ -314,7 +314,7 @@ static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`/* stall and reset dsp */`
`317`		`- sof_hifixdsp_shutdown(sdev);`
	`317`	`+ mt8195_sof_hifixdsp_shutdown(sdev);`
`318`	`318`
`319`	`319`	`/* power down adsp sram */`
`320`	`320`	`ret = adsp_sram_power_on(&pdev->dev, false);`
`@@ -324,17 +324,17 @@ static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`/* turn off adsp clock */`
`327`		`- return adsp_clock_off(sdev);`
	`327`	`+ return mt8195_adsp_clock_off(sdev);`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`static int mt8195_dsp_resume(struct snd_sof_dev *sdev)`
`331`	`331`	`{`
`332`	`332`	`int ret;`
`333`	`333`
`334`	`334`	`/* turn on adsp clock */`
`335`		`- ret = adsp_clock_on(sdev);`
	`335`	`+ ret = mt8195_adsp_clock_on(sdev);`
`336`	`336`	`if (ret) {`
`337`		`- dev_err(sdev->dev, "adsp_clock_on fail!\n");`
	`337`	`+ dev_err(sdev->dev, "mt8195_adsp_clock_on fail!\n");`
`338`	`338`	`return ret;`
`339`	`339`	`}`
`340`	`340`