Skip to contentSkip to conversation

ASoC: meson: depend on COMMON_CLK to fix compile tests

PATCH In review Krzysztof Kozlowski 2 participants 6 messages Nov 16, 2020 – Nov 23, 2020

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ASoC: meson: depend on COMMON_CLK to fix compile tests

The Meson SoC sound drivers use Common Clock Framework thus they cannot be built on platforms without it (e.g. compile test on MIPS with RALINK and SOC_RT305X):

/usr/bin/mips-linux-gnu-ld: sound/soc/meson/aiu-encoder-spdif.o: in function `aiu_encoder_spdif_startup':
aiu-encoder-spdif.c:(.text+0x3a0): undefined reference to clk_set_parent' /usr/bin/mips-linux-gnu-ld: sound/soc/meson/axg-tdm-formatter.o: in function axg_tdm_formatter_event':
(.text+0x7ec): undefined reference to `clk_set_parent'

---
 sound/soc/meson/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/meson/Kconfig +1 -1
index 363dc3b1bbe4..dd8a05e61f58 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menu "ASoC support for Amlogic platforms"
-	depends on ARCH_MESON || COMPILE_TEST
+	depends on ARCH_MESON || COMPILE_TEST && COMMON_CLK
 
 config SND_MESON_AIU
 	tristate "Amlogic AIU"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/4 ASoC: sh: depend on COMMON_CLK to fix compile tests

The SH4 FSI sound drivers use SuperH clocks thus they cannot be built on platforms without proper clock support (e.g. compile test on MIPS with RALINK and SOC_RT305X):

/usr/bin/mips-linux-gnu-ld: sound/soc/sh/fsi.o: in function `fsi_clk_set_rate_external':
fsi.c:(.text+0x2714): undefined reference to `clk_set_parent'

---
 sound/soc/sh/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sh/Kconfig +1 -0
index ef8a29b9f641..346c806ba390 100644
@@ -23,6 +23,7 @@ config SND_SOC_SH4_SSI
 
 config SND_SOC_SH4_FSI
 	tristate "SH4 FSI support"
+	depends on SUPERH || COMMON_CLK
 	select SND_SIMPLE_CARD
 	help
 	  This option enables FSI sound support
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/4 ASoC: stm: depend on COMMON_CLK to fix compile tests

In reply to Krzysztof Kozlowski

The STM32 I2S drivers use Common Clock Framework thus they cannot be built on platforms without it (e.g. compile test on MIPS with RALINK and SOC_RT305X):

    /usr/bin/mips-linux-gnu-ld: sound/soc/stm/stm32_i2s.o: in function `stm32_i2s_hw_params':
    stm32_i2s.c:(.text+0x1870): undefined reference to `clk_set_parent'
---
 sound/soc/stm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/stm/Kconfig +1 -0
index bbade257fe89..da1f7a16605b 100644
@@ -15,6 +15,7 @@ config SND_SOC_STM32_SAI
 config SND_SOC_STM32_I2S
 	tristate "STM32 I2S interface (SPI/I2S block) support"
 	depends on (ARCH_STM32 && OF) || COMPILE_TEST
+	depends on COMMON_CLK
 	depends on SND_SOC
 	select SND_SOC_GENERIC_DMAENGINE_PCM
 	select REGMAP_MMIO
Signature · 1 line
2.25.1
#3 lore raw

PATCH 4/4 ASoC: ti: depend on COMMON_CLK to fix compile tests

In reply to Krzysztof Kozlowski

The TI/OMAP sound drivers use Common Clock Framework thus they cannot be built on platforms without it (e.g. compile test on MIPS with RALINK and SOC_RT305X):

    /usr/bin/mips-linux-gnu-ld: sound/soc/ti/davinci-mcasp.o:davinci-mcasp.c:(.text+0x1c64): more undefined references to `clk_set_parent' follow
    /usr/bin/mips-linux-gnu-ld: sound/soc/ti/omap-dmic.o: in function `omap_dmic_set_dai_sysclk':
    omap-dmic.c:(.text+0xa5c): undefined reference to `clk_get_parent'
---
 sound/soc/ti/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
sound/soc/ti/Kconfig +5 -4
index 9775393d46b6..698d7bc84dcf 100644
@@ -26,6 +26,7 @@ config SND_SOC_DAVINCI_ASP
 
 config SND_SOC_DAVINCI_MCASP
 	tristate "Multichannel Audio Serial Port (McASP) support"
+	depends on COMMON_CLK
 	select SND_SOC_TI_EDMA_PCM
 	select SND_SOC_TI_SDMA_PCM
 	select SND_SOC_TI_UDMA_PCM
@@ -47,7 +48,7 @@ config SND_SOC_DAVINCI_VCIF
 
 config SND_SOC_OMAP_DMIC
 	tristate "Digital Microphone Module (DMIC) support"
-	depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST
+	depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST && COMMON_CLK
 	select SND_SOC_TI_SDMA_PCM
 	help
 	  Say Y or M here if you want to have support for DMIC IP found in
@@ -55,7 +56,7 @@ config SND_SOC_OMAP_DMIC
 
 config SND_SOC_OMAP_MCBSP
 	tristate "Multichannel Buffered Serial Port (McBSP) support"
-	depends on ARCH_OMAP || ARCH_OMAP1 || COMPILE_TEST
+	depends on ARCH_OMAP || ARCH_OMAP1 || COMPILE_TEST && COMMON_CLK
 	select SND_SOC_TI_SDMA_PCM
 	help
 	  Say Y or M here if you want to have support for McBSP IP found in
@@ -99,7 +100,7 @@ config SND_SOC_OMAP3_PANDORA
 
 config SND_SOC_OMAP3_TWL4030
 	tristate "SoC Audio support for OMAP3 based boards with twl4030 codec"
-	depends on ARCH_OMAP3 || COMPILE_TEST
+	depends on ARCH_OMAP3 || COMPILE_TEST && COMMON_CLK
 	depends on TWL4030_CORE
 	select SND_SOC_OMAP_MCBSP
 	select SND_SOC_TWL4030
@@ -221,7 +222,7 @@ config SND_SOC_DM365_VOICE_CODEC_MODULE
 
 config SND_SOC_J721E_EVM
 	tristate "SoC Audio support for j721e EVM"
-	depends on ARCH_K3 || COMPILE_TEST
+	depends on ARCH_K3 || COMPILE_TEST && COMMON_CLK
 	depends on I2C
 	select SND_SOC_PCM3168A_I2C
 	select SND_SOC_DAVINCI_MCASP
Signature · 1 line
2.25.1
maintainer
#4 lore raw
In reply to Krzysztof Kozlowski
Quoted 3 lines · Krzysztof Kozlowski

The Meson SoC sound drivers use Common Clock Framework thus they cannot be built on platforms without it (e.g. compile test on MIPS with RALINK and SOC_RT305X):

This doesn't apply against current code, please check and resend.

maintainer
#5 lore raw
In reply to Krzysztof Kozlowski
Quoted 8 lines · Krzysztof Kozlowski

The Meson SoC sound drivers use Common Clock Framework thus they cannot be built on platforms without it (e.g. compile test on MIPS with RALINK and SOC_RT305X):

/usr/bin/mips-linux-gnu-ld: sound/soc/meson/aiu-encoder-spdif.o: in function `aiu_encoder_spdif_startup':
aiu-encoder-spdif.c:(.text+0x3a0): undefined reference to clk_set_parent' /usr/bin/mips-linux-gnu-ld: sound/soc/meson/axg-tdm-formatter.o: in function axg_tdm_formatter_event':
(.text+0x7ec): undefined reference to `clk_set_parent'

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/4] ASoC: meson: depend on COMMON_CLK to fix compile tests
(no commit info)
[2/4] ASoC: sh: depend on COMMON_CLK to fix compile tests

      commit: c3d900dc905b78788c94f3a063b769bdbad16a98
[3/4] ASoC: stm: depend on COMMON_CLK to fix compile tests
      commit: 82ceffce96336ee9863f3dfde63aef5748ca4ab1
[4/4] ASoC: ti: depend on COMMON_CLK to fix compile tests
      commit: b3cf78e0dacb7fba50d0c1eb9dfa6f92d31529e2

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