* [PATCH v2] ASoC: SOF: mediatek: Fix allyesconfig build error
@ 2022-04-27 7:10 Tinghan Shen
2022-04-27 15:39 ` Pierre-Louis Bossart
2022-04-27 22:02 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Tinghan Shen @ 2022-04-27 7:10 UTC (permalink / raw)
To: Pierre-Louis Bossart, Liam Girdwood, Ranjani Sridharan,
Kai Vehmanen, Daniel Baluta, Mark Brown, Jaroslav Kysela,
Takashi Iwai, Matthias Brugger, Tinghan Shen, Yaochun Hung,
Allen-KH Cheng, Yang Yingliang
Cc: sound-open-firmware, alsa-devel, linux-arm-kernel,
linux-mediatek, linux-kernel,
Project_Global_Chrome_Upstream_Group
ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o:(.opd+0x18): multiple
definition of `adsp_clock_on';
sound/soc/sof/mediatek/mt8195/mt8195-clk.o:(.opd+0x60): first defined
here
ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o: in function
`.adsp_clock_on':
ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o:(.opd+0x30): multiple
definition of `adsp_clock_off';
sound/soc/sof/mediatek/mt8195/mt8195-clk.o:(.opd+0x78): first defined
here
ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o: in function
`.adsp_clock_off':
ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o:(.opd+0x0): multiple
definition of `sof_hifixdsp_boot_sequence';
sound/soc/sof/mediatek/mt8195/mt8195-loader.o:(.opd+0x0): first defined
here
ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o: in function
`.sof_hifixdsp_boot_sequence':
ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o:(.opd+0x18): multiple
definition of `sof_hifixdsp_shutdown';
sound/soc/sof/mediatek/mt8195/mt8195-loader.o:(.opd+0x18): first defined
here
ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o: in function
`.sof_hifixdsp_shutdown':
Fixes: 570c14dc92d5 ("ASoC: SOF: mediatek: Add mt8186 sof fw loader and
dsp ops")
Fixes: 210b3ab932f7 ("ASoC: SOF: mediatek: Add mt8186 dsp clock support")
Signed-off-by: Tinghan Shen <tinghan.shen@mediatek.com>
---
Changes since v1:
Rebase on Mark's for-next and update "Fixes" commit id
---
sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 4 ++--
sound/soc/sof/mediatek/mt8186/mt8186-clk.h | 4 ++--
sound/soc/sof/mediatek/mt8186/mt8186-loader.c | 4 ++--
sound/soc/sof/mediatek/mt8186/mt8186.c | 18 +++++++++---------
sound/soc/sof/mediatek/mt8186/mt8186.h | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/sound/soc/sof/mediatek/mt8186/mt8186-clk.c b/sound/soc/sof/mediatek/mt8186/mt8186-clk.c
index 5f805981b8e6..22220fd50b62 100644
--- a/sound/soc/sof/mediatek/mt8186/mt8186-clk.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186-clk.c
@@ -74,7 +74,7 @@ static void adsp_disable_all_clock(struct snd_sof_dev *sdev)
clk_disable_unprepare(priv->clk[CLK_TOP_AUDIODSP]);
}
-int adsp_clock_on(struct snd_sof_dev *sdev)
+int mt8186_adsp_clock_on(struct snd_sof_dev *sdev)
{
struct device *dev = sdev->dev;
int ret;
@@ -92,7 +92,7 @@ int adsp_clock_on(struct snd_sof_dev *sdev)
return 0;
}
-void adsp_clock_off(struct snd_sof_dev *sdev)
+void mt8186_adsp_clock_off(struct snd_sof_dev *sdev)
{
snd_sof_dsp_write(sdev, DSP_REG_BAR, ADSP_CK_EN, 0);
snd_sof_dsp_write(sdev, DSP_REG_BAR, ADSP_UART_CTRL, 0);
diff --git a/sound/soc/sof/mediatek/mt8186/mt8186-clk.h b/sound/soc/sof/mediatek/mt8186/mt8186-clk.h
index fa174dfceff0..89c23caf0fee 100644
--- a/sound/soc/sof/mediatek/mt8186/mt8186-clk.h
+++ b/sound/soc/sof/mediatek/mt8186/mt8186-clk.h
@@ -19,6 +19,6 @@ enum adsp_clk_id {
};
int mt8186_adsp_init_clock(struct snd_sof_dev *sdev);
-int adsp_clock_on(struct snd_sof_dev *sdev);
-void adsp_clock_off(struct snd_sof_dev *sdev);
+int mt8186_adsp_clock_on(struct snd_sof_dev *sdev);
+void mt8186_adsp_clock_off(struct snd_sof_dev *sdev);
#endif
diff --git a/sound/soc/sof/mediatek/mt8186/mt8186-loader.c b/sound/soc/sof/mediatek/mt8186/mt8186-loader.c
index 6ab4921b1010..548b12c33d8a 100644
--- a/sound/soc/sof/mediatek/mt8186/mt8186-loader.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186-loader.c
@@ -11,7 +11,7 @@
#include "mt8186.h"
#include "../../ops.h"
-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
+void mt8186_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
{
/* set RUNSTALL to stop core */
snd_sof_dsp_update_bits(sdev, DSP_REG_BAR, ADSP_HIFI_IO_CONFIG,
@@ -39,7 +39,7 @@ void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)
RUNSTALL, 0);
}
-void sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)
+void mt8186_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev)
{
/* set RUNSTALL to stop core */
snd_sof_dsp_update_bits(sdev, DSP_REG_BAR, ADSP_HIFI_IO_CONFIG,
diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c
index c8faa63497c6..6d574fd4492e 100644
--- a/sound/soc/sof/mediatek/mt8186/mt8186.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c
@@ -211,7 +211,7 @@ static int mt8186_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);
+ mt8186_sof_hifixdsp_boot_sequence(sdev, adsp_bootup_addr);
return 0;
}
@@ -284,9 +284,9 @@ static int mt8186_dsp_probe(struct snd_sof_dev *sdev)
return ret;
}
- ret = adsp_clock_on(sdev);
+ ret = mt8186_adsp_clock_on(sdev);
if (ret) {
- dev_err(sdev->dev, "adsp_clock_on fail!\n");
+ dev_err(sdev->dev, "mt8186_adsp_clock_on fail!\n");
return ret;
}
@@ -297,18 +297,18 @@ static int mt8186_dsp_probe(struct snd_sof_dev *sdev)
static int mt8186_dsp_remove(struct snd_sof_dev *sdev)
{
- sof_hifixdsp_shutdown(sdev);
+ mt8186_sof_hifixdsp_shutdown(sdev);
adsp_sram_power_off(sdev);
- adsp_clock_off(sdev);
+ mt8186_adsp_clock_off(sdev);
return 0;
}
static int mt8186_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
{
- sof_hifixdsp_shutdown(sdev);
+ mt8186_sof_hifixdsp_shutdown(sdev);
adsp_sram_power_off(sdev);
- adsp_clock_off(sdev);
+ mt8186_adsp_clock_off(sdev);
return 0;
}
@@ -317,9 +317,9 @@ static int mt8186_dsp_resume(struct snd_sof_dev *sdev)
{
int ret;
- ret = adsp_clock_on(sdev);
+ ret = mt8186_adsp_clock_on(sdev);
if (ret) {
- dev_err(sdev->dev, "adsp_clock_on fail!\n");
+ dev_err(sdev->dev, "mt8186_adsp_clock_on fail!\n");
return ret;
}
diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.h b/sound/soc/sof/mediatek/mt8186/mt8186.h
index df52ae9659e4..98b2965e5ba6 100644
--- a/sound/soc/sof/mediatek/mt8186/mt8186.h
+++ b/sound/soc/sof/mediatek/mt8186/mt8186.h
@@ -75,6 +75,6 @@ struct snd_sof_dev;
#define SIZE_SHARED_DRAM_UL 0x40000 /*Shared buffer for Uplink*/
#define TOTAL_SIZE_SHARED_DRAM_FROM_TAIL (SIZE_SHARED_DRAM_DL + SIZE_SHARED_DRAM_UL)
-void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr);
-void sof_hifixdsp_shutdown(struct snd_sof_dev *sdev);
+void mt8186_sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr);
+void mt8186_sof_hifixdsp_shutdown(struct snd_sof_dev *sdev);
#endif
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ASoC: SOF: mediatek: Fix allyesconfig build error
2022-04-27 7:10 [PATCH v2] ASoC: SOF: mediatek: Fix allyesconfig build error Tinghan Shen
@ 2022-04-27 15:39 ` Pierre-Louis Bossart
2022-04-27 22:02 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Pierre-Louis Bossart @ 2022-04-27 15:39 UTC (permalink / raw)
To: Tinghan Shen, Liam Girdwood, Ranjani Sridharan, Kai Vehmanen,
Daniel Baluta, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Matthias Brugger, Yaochun Hung, Allen-KH Cheng, Yang Yingliang
Cc: sound-open-firmware, alsa-devel, linux-arm-kernel,
linux-mediatek, linux-kernel,
Project_Global_Chrome_Upstream_Group
On 4/27/22 02:10, Tinghan Shen wrote:
> ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o:(.opd+0x18): multiple
> definition of `adsp_clock_on';
> sound/soc/sof/mediatek/mt8195/mt8195-clk.o:(.opd+0x60): first defined
> here
> ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o: in function
> `.adsp_clock_on':
>
> ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o:(.opd+0x30): multiple
> definition of `adsp_clock_off';
> sound/soc/sof/mediatek/mt8195/mt8195-clk.o:(.opd+0x78): first defined
> here
> ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o: in function
> `.adsp_clock_off':
>
> ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o:(.opd+0x0): multiple
> definition of `sof_hifixdsp_boot_sequence';
> sound/soc/sof/mediatek/mt8195/mt8195-loader.o:(.opd+0x0): first defined
> here
> ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o: in function
> `.sof_hifixdsp_boot_sequence':
>
> ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o:(.opd+0x18): multiple
> definition of `sof_hifixdsp_shutdown';
> sound/soc/sof/mediatek/mt8195/mt8195-loader.o:(.opd+0x18): first defined
> here
> ld: sound/soc/sof/mediatek/mt8186/mt8186-loader.o: in function
> `.sof_hifixdsp_shutdown':
>
> Fixes: 570c14dc92d5 ("ASoC: SOF: mediatek: Add mt8186 sof fw loader and
> dsp ops")
> Fixes: 210b3ab932f7 ("ASoC: SOF: mediatek: Add mt8186 dsp clock support")
>
> Signed-off-by: Tinghan Shen <tinghan.shen@mediatek.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
>
> Changes since v1:
> Rebase on Mark's for-next and update "Fixes" commit id
>
> ---
> sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 4 ++--
> sound/soc/sof/mediatek/mt8186/mt8186-clk.h | 4 ++--
> sound/soc/sof/mediatek/mt8186/mt8186-loader.c | 4 ++--
> sound/soc/sof/mediatek/mt8186/mt8186.c | 18 +++++++++---------
> sound/soc/sof/mediatek/mt8186/mt8186.h | 4 ++--
> 5 files changed, 17 insertions(+), 17 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ASoC: SOF: mediatek: Fix allyesconfig build error
2022-04-27 7:10 [PATCH v2] ASoC: SOF: mediatek: Fix allyesconfig build error Tinghan Shen
2022-04-27 15:39 ` Pierre-Louis Bossart
@ 2022-04-27 22:02 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2022-04-27 22:02 UTC (permalink / raw)
To: yc.hung, tiwai, matthias.bgg, perex, allen-kh.cheng,
ranjani.sridharan, yangyingliang, daniel.baluta, kai.vehmanen,
pierre-louis.bossart, tinghan.shen, lgirdwood
Cc: sound-open-firmware, Project_Global_Chrome_Upstream_Group,
linux-kernel, linux-mediatek, linux-arm-kernel, alsa-devel
On Wed, 27 Apr 2022 15:10:30 +0800, Tinghan Shen wrote:
> ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o:(.opd+0x18): multiple
> definition of `adsp_clock_on';
> sound/soc/sof/mediatek/mt8195/mt8195-clk.o:(.opd+0x60): first defined
> here
> ld: sound/soc/sof/mediatek/mt8186/mt8186-clk.o: in function
> `.adsp_clock_on':
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: mediatek: Fix allyesconfig build error
commit: 9ce170dc9c08895846c5828addb724e42bf98484
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-27 22:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-27 7:10 [PATCH v2] ASoC: SOF: mediatek: Fix allyesconfig build error Tinghan Shen
2022-04-27 15:39 ` Pierre-Louis Bossart
2022-04-27 22:02 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).