| Message ID | 20221015001228.18990-1-rdunlap@infradead.org |
|---|---|
| State | Accepted |
| Commit | 9a7f2c9e7a19b16b4409f372cf2e16e4334cdca2 |
| Headers | show |
| Series | ASoC: qcom: SND_SOC_SC7180 optionally depends on SOUNDWIRE | expand |
On Fri, 14 Oct 2022 17:12:28 -0700, Randy Dunlap wrote: > If SOUNDWIRE is enabled, then SND_SOC_SC7180 should depend on > SOUNDWIRE to prevent SOUNDWIRE=m and SND_SOC_SC7180=y, which causes > build errors: > > s390-linux-ld: sound/soc/qcom/common.o: in function `qcom_snd_sdw_prepare': > common.c:(.text+0x140): undefined reference to `sdw_disable_stream' > s390-linux-ld: common.c:(.text+0x14a): undefined reference to `sdw_deprepare_stream' > s390-linux-ld: common.c:(.text+0x158): undefined reference to `sdw_prepare_stream' > s390-linux-ld: common.c:(.text+0x16a): undefined reference to `sdw_enable_stream' > s390-linux-ld: common.c:(.text+0x17c): undefined reference to `sdw_deprepare_stream' > s390-linux-ld: sound/soc/qcom/common.o: in function `qcom_snd_sdw_hw_free': > common.c:(.text+0x344): undefined reference to `sdw_disable_stream' > s390-linux-ld: common.c:(.text+0x34e): undefined reference to `sdw_deprepare_stream' > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: qcom: SND_SOC_SC7180 optionally depends on SOUNDWIRE commit: 9a7f2c9e7a19b16b4409f372cf2e16e4334cdca2 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
diff -- a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -187,6 +187,7 @@ config SND_SOC_SC8280XP config SND_SOC_SC7180 tristate "SoC Machine driver for SC7180 boards" depends on I2C && GPIOLIB + depends on SOUNDWIRE || SOUNDWIRE=n select SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7180 select SND_SOC_MAX98357A
If SOUNDWIRE is enabled, then SND_SOC_SC7180 should depend on SOUNDWIRE to prevent SOUNDWIRE=m and SND_SOC_SC7180=y, which causes build errors: s390-linux-ld: sound/soc/qcom/common.o: in function `qcom_snd_sdw_prepare': common.c:(.text+0x140): undefined reference to `sdw_disable_stream' s390-linux-ld: common.c:(.text+0x14a): undefined reference to `sdw_deprepare_stream' s390-linux-ld: common.c:(.text+0x158): undefined reference to `sdw_prepare_stream' s390-linux-ld: common.c:(.text+0x16a): undefined reference to `sdw_enable_stream' s390-linux-ld: common.c:(.text+0x17c): undefined reference to `sdw_deprepare_stream' s390-linux-ld: sound/soc/qcom/common.o: in function `qcom_snd_sdw_hw_free': common.c:(.text+0x344): undefined reference to `sdw_disable_stream' s390-linux-ld: common.c:(.text+0x34e): undefined reference to `sdw_deprepare_stream' Fixes: 3bd975f3ae0a ("ASoC: qcom: sm8250: move some code to common") Fixes: 9e3ecb5b1681 ("ASoC: qcom: sc7180: Add machine driver for sound card registration") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: kernel test robot <lkp@intel.com> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Banajit Goswami <bgoswami@quicinc.com> Cc: Mark Brown <broonie@kernel.org> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Ajit Pandey <ajitp@codeaurora.org> Cc: Cheng-Yi Chiang <cychiang@chromium.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: stable@vger.kernel.org Cc: alsa-devel@alsa-project.org --- Sorry, I can't tell which Fixes: hash is appropriate here. sound/soc/qcom/Kconfig | 1 + 1 file changed, 1 insertion(+)