ASoC: ti: fix davinci_mcasp_probe dependencies
Subsystems (5)
PATCH 1/3 ASoC: ti: fix davinci_mcasp_probe dependencies
The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways:
- With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y,
is enabled as =m, and we get a link error:
sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'
- When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by another driver, the same link error appears even if CONFIG_TI_EDMA is disabled
There are possibly other issues here, but it seems that the only reasonable solution is to always build both SND_SOC_TI_EDMA_PCM and SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent.
--- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/ti/Kconfig +2 -2
@@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like:
Signature · 1 line
2.20.0
PATCH 2/3 ASoC: ti: remove compat dma probing
After running into a link error:
sound/soc/ti/edma-pcm.o:(.rodata+0x18): undefined reference to `edma_filter_fn'
I checked all users of this, and they have new-style 'dma_slave_map' tables, so none of them should still need it. Removing the associated lines simplifies the code and avoids the build-time dependency on the respective dmaengine drivers.
--- sound/soc/ti/edma-pcm.c | 4 +--- sound/soc/ti/sdma-pcm.c | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-)
sound/soc/ti/edma-pcm.c +1 -3
@@ -43,14 +43,12 @@ static const struct snd_pcm_hardware edma_pcm_hardware = {static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { .pcm_hardware = &edma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = edma_filter_fn, .prealloc_buffer_size =128 *1024 , };int edma_pcm_platform_register (struct device *dev) { -return devm_snd_dmaengine_pcm_register (dev, &edma_dmaengine_pcm_config, -SND_DMAENGINE_PCM_FLAG_COMPAT ); +return devm_snd_dmaengine_pcm_register (dev, &edma_dmaengine_pcm_config,0 ); }EXPORT_SYMBOL_GPL (edma_pcm_platform_register);
sound/soc/ti/sdma-pcm.c +3 -5
@@ -31,7 +31,6 @@ static const struct snd_pcm_hardware sdma_pcm_hardware = {static const struct snd_dmaengine_pcm_config sdma_dmaengine_pcm_config = { .pcm_hardware = &sdma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = omap_dma_filter_fn, .prealloc_buffer_size =128 *1024 , };
@@ -39,13 +38,12 @@ int sdma_pcm_platform_register(struct device *dev, char *txdmachan, char *rxdmachan) { struct snd_dmaengine_pcm_config *config; -unsigned int flags =SND_DMAENGINE_PCM_FLAG_COMPAT ; +unsigned int flags =0 ;/* Standard names for the directions: 'tx' and 'rx' */ if (!txdmachan && !rxdmachan)return devm_snd_dmaengine_pcm_register (dev, - &sdma_dmaengine_pcm_config, - flags); + &sdma_dmaengine_pcm_config,0 ); config =devm_kzalloc (dev,sizeof (*config),GFP_KERNEL );if (!config)
@@ -65,7 +63,7 @@ int sdma_pcm_platform_register(struct device *dev, config->chan_names[0 ] = txdmachan; config->chan_names[1 ] = rxdmachan; -return devm_snd_dmaengine_pcm_register (dev, config, flags); +return devm_snd_dmaengine_pcm_register (dev, config,0 ); }EXPORT_SYMBOL_GPL (sdma_pcm_platform_register);
Signature · 1 line
2.20.0
Re: [PATCH 2/3] ASoC: ti: remove compat dma probing
Hi Arnd,
Quoted 8 lines · Arnd Bergmann
After running into a link error:
sound/soc/ti/edma-pcm.o:(.rodata+0x18): undefined reference to `edma_filter_fn'
I checked all users of this, and they have new-style '
dma_slave_map' tables, so none of them should still need it. Removing the associated lines simplifies the code and avoids the build-time dependency on the respective dmaengine drivers.
Thank you for the patch!
Yes, I believe I have covered all possible legacy uses for both edma and sdma with dma_slave_map
With the two comments addressed:
Quoted 11 lines
Signed-off-by Arnd Bergmann <[email protected]>--- sound/soc/ti/edma-pcm.c | 4 +--- sound/soc/ti/sdma-pcm.c | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-)sound/soc/ti/edma-pcm.c +0
-0
sound/soc/ti/edma-pcm.c static const struct snd_pcm_hardware edma_pcm_hardware = { · line 46
Quoted 4 lines
sound/soc/ti/edma-pcm.c +0
-1@@ -43,14 +43,12 @@ static const struct snd_pcm_hardware edma_pcm_hardware = {static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { .pcm_hardware = &edma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = edma_filter_fn,
We can also remove the
#include <linux/edma.h>
as it is no longer needed.
Quoted 16 lines
sound/soc/ti/edma-pcm.c +1
-2.prealloc_buffer_size = 128 * 1024, };int edma_pcm_platform_register (struct device *dev) { -return devm_snd_dmaengine_pcm_register (dev, &edma_dmaengine_pcm_config, -SND_DMAENGINE_PCM_FLAG_COMPAT ); +return devm_snd_dmaengine_pcm_register (dev, &edma_dmaengine_pcm_config,0 ); }EXPORT_SYMBOL_GPL (edma_pcm_platform_register);sound/soc/ti/sdma-pcm.c +0
-0
sound/soc/ti/sdma-pcm.c static const struct snd_pcm_hardware sdma_pcm_hardware = { · line 34
Quoted 4 lines
sound/soc/ti/sdma-pcm.c +0
-1@@ -31,7 +31,6 @@ static const struct snd_pcm_hardware sdma_pcm_hardware = {static const struct snd_dmaengine_pcm_config sdma_dmaengine_pcm_config = { .pcm_hardware = &sdma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = omap_dma_filter_fn,
Here we can remove the
#include <linux/omap-dmaengine.h>
Quoted 21 lines
sound/soc/ti/sdma-pcm.c +2
-3.prealloc_buffer_size = 128 * 1024, };@@ -39,13 +38,12 @@ int sdma_pcm_platform_register(struct device *dev, char *txdmachan, char *rxdmachan) { struct snd_dmaengine_pcm_config *config; -unsigned int flags =SND_DMAENGINE_PCM_FLAG_COMPAT ; +unsigned int flags =0 ;/* Standard names for the directions: 'tx' and 'rx' */ if (!txdmachan && !rxdmachan)return devm_snd_dmaengine_pcm_register (dev, - &sdma_dmaengine_pcm_config, - flags); + &sdma_dmaengine_pcm_config,0 ); config =devm_kzalloc (dev,sizeof (*config),GFP_KERNEL );if (!config)
sound/soc/ti/sdma-pcm.c int sdma_pcm_platform_register(struct device *dev, · line 69
Quoted 8 lines
sound/soc/ti/sdma-pcm.c +1
-1@@ -65,7 +63,7 @@ int sdma_pcm_platform_register(struct device *dev, config->chan_names[0 ] = txdmachan; config->chan_names[1 ] = rxdmachan; -return devm_snd_dmaengine_pcm_register (dev, config, flags); +return devm_snd_dmaengine_pcm_register (dev, config,0 ); }EXPORT_SYMBOL_GPL (sdma_pcm_platform_register);
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Re: [PATCH 2/3] ASoC: ti: remove compat dma probing
Quoted 13 lines · Peter Ujfalusi
Hi Arnd,
Quoted 8 lines · Arnd Bergmann
After running into a link error:
sound/soc/ti/edma-pcm.o:(.rodata+0x18): undefined reference to `edma_filter_fn'
I checked all users of this, and they have new-style '
dma_slave_map' tables, so none of them should still need it. Removing the associated lines simplifies the code and avoids the build-time dependency on the respective dmaengine drivers.
Quoted 7 lines
Thank you for the patch!
Yes, I believe I have covered all possible legacy uses for both edma and sdma with
dma_slave_mapWith the two comments addressed:
Acked-by Peter Ujfalusi <[email protected]>
Thanks!
Quoted 9 lines
sound/soc/ti/edma-pcm.c static const struct snd_pcm_hardware edma_pcm_hardware = { · line 46
Quoted 5 lines
sound/soc/ti/edma-pcm.c +0
-1@@ -43,14 +43,12 @@ static const struct snd_pcm_hardware edma_pcm_hardware = {static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { .pcm_hardware = &edma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = edma_filter_fn,We can also remove the
#include <linux/edma.h>
Quoted 4 lines
as it is no longer needed.
Here we can remove the
#include <linux/omap-dmaengine.h>
Ah, perfect!
I also see that linux/edma.h can be completely removed afterwards, and the filter function made static. linux/omap-dmaengine.h too, but it is included from linux/omap.h, of which at least parts are still needed for omap_udc.c
Arnd
PATCH 3/3 ASoC: qcom: add i2c dependency for SND_SOC_SDM845
In reply to Arnd BergmannWe must not select SND_SOC_MAX98927 unless CONFIG_I2C is also enabled:
WARNING: unmet direct dependencies detected for SND_SOC_MAX98927
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n]
Selected by [y]:
- SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && MFD_CROS_EC [=y]
--- sound/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/Kconfig +1 -1
@@ -98,7 +98,7 @@ config SND_SOC_MSM8996 config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" - depends on QCOM_APR && MFD_CROS_EC + depends on QCOM_APR && MFD_CROS_EC && I2C select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON select SND_SOC_RT5663
Signature · 1 line
2.20.0
Re: [PATCH 3/3] ASoC: qcom: add i2c dependency for SND_SOC_SDM845
Quoted 28 lines · Arnd Bergmann
We must not select
SND_SOC_MAX98927unlessCONFIG_I2Cis also enabled:WARNING: unmet direct dependencies detected for
SND_SOC_MAX98927
Depends on [n]: SOUND [=y] && !UML && SND [=y] &&SND_SOC[=y] && I2C [=n]
Selected by [y]:
-SND_SOC_SDM845[=y] && SOUND [=y] && !UML && SND [=y] &&SND_SOC[=y] &&QCOM_APR[=y] &&MFD_CROS_EC[=y]Signed-off-by Arnd Bergmann <[email protected]>--- sound/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/qcom/Kconfig +1
-2@@ -98,7 +98,7 @@ config SND_SOC_MSM8996 config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" - depends on QCOM_APR && MFD_CROS_EC + depends on QCOM_APR && MFD_CROS_EC && I2C select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON select SND_SOC_RT5663 --
Quoted 2 lines
2.20.0
Hi Arnd,
Thank you for the fix.
Mark Brown
maintainerApplied "ASoC: qcom: add i2c dependency for SND_SOC_SDM845" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: qcom: add i2c dependency for SND_SOC_SDM845
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
686174a0989b1c33698b26523a1e4ccdcc84cf22Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 4 Mar 2019 21:30:52 +0100
Subject: [PATCH] ASoC: qcom: add i2c dependency for SND_SOC_SDM845
We must not select SND_SOC_MAX98927 unless CONFIG_I2C is also enabled:
WARNING: unmet direct dependencies detected for SND_SOC_MAX98927
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n]
Selected by [y]:
- SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && MFD_CROS_EC [=y]
--- sound/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/Kconfig +1 -1
@@ -98,7 +98,7 @@ config SND_SOC_MSM8996 config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" - depends on QCOM_APR && MFD_CROS_EC + depends on QCOM_APR && MFD_CROS_EC && I2C select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON select SND_SOC_RT5663
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: qcom: add i2c dependency for SND_SOC_SDM845" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: qcom: add i2c dependency for SND_SOC_SDM845
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
686174a0989b1c33698b26523a1e4ccdcc84cf22Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 4 Mar 2019 21:30:52 +0100
Subject: [PATCH] ASoC: qcom: add i2c dependency for SND_SOC_SDM845
We must not select SND_SOC_MAX98927 unless CONFIG_I2C is also enabled:
WARNING: unmet direct dependencies detected for SND_SOC_MAX98927
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n]
Selected by [y]:
- SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && MFD_CROS_EC [=y]
--- sound/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/Kconfig +1 -1
@@ -98,7 +98,7 @@ config SND_SOC_MSM8996 config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" - depends on QCOM_APR && MFD_CROS_EC + depends on QCOM_APR && MFD_CROS_EC && I2C select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON select SND_SOC_RT5663
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: qcom: add i2c dependency for SND_SOC_SDM845" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: qcom: add i2c dependency for SND_SOC_SDM845
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
686174a0989b1c33698b26523a1e4ccdcc84cf22Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 4 Mar 2019 21:30:52 +0100
Subject: [PATCH] ASoC: qcom: add i2c dependency for SND_SOC_SDM845
We must not select SND_SOC_MAX98927 unless CONFIG_I2C is also enabled:
WARNING: unmet direct dependencies detected for SND_SOC_MAX98927
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n]
Selected by [y]:
- SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && MFD_CROS_EC [=y]
--- sound/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/Kconfig +1 -1
@@ -98,7 +98,7 @@ config SND_SOC_MSM8996 config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" - depends on QCOM_APR && MFD_CROS_EC + depends on QCOM_APR && MFD_CROS_EC && I2C select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON select SND_SOC_RT5663
Signature · 1 line
2.20.1
Hi Arnd,
Quoted 9 lines · Arnd Bergmann
The
SND_SOC_DAVINCI_MCASPdriver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways:- With
CONFIG_TI_EDMA=mandCONFIG_SND_SOC_DAVINCI_MCASP=y,
is enabled as =m, and we get a link error:
sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'
In non randconfig case both edma and sdma DMAengine driver would be built in so I did missed this for sure.
Quoted 9 lines
- When
CONFIG_SND_SOC_DAVINCI_MCASP=mhas already been selected by another driver, the same link error appears even ifCONFIG_TI_EDMAis disabledThere are possibly other issues here, but it seems that the only reasonable solution is to always build both
SND_SOC_TI_EDMA_PCMandSND_SOC_TI_SDMA_PCMas a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent.
Quoted 13 lines
Fixes f2055e145f29 ("ASoC: ti: Merge davinci and omap directories")Signed-off-by Arnd Bergmann <[email protected]>--- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/soc/ti/Kconfig +0
-0
sound/soc/ti/Kconfig config SND_SOC_DAVINCI_ASP · line 28
Quoted 10 lines
sound/soc/ti/Kconfig +2
-2@@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like:
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Mark Brown
maintainerApplied "ASoC: ti: fix davinci_mcasp_probe dependencies" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: ti: fix davinci_mcasp_probe dependencies
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
7d7b25d05ef1c5a1a9320190e1eeb55534847558Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 4 Mar 2019 21:30:50 +0100
Subject: [PATCH] ASoC: ti: fix davinci_mcasp_probe dependencies
The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways:
- With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y,
is enabled as =m, and we get a link error:
sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'
- When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by another driver, the same link error appears even if CONFIG_TI_EDMA is disabled
There are possibly other issues here, but it seems that the only reasonable solution is to always build both SND_SOC_TI_EDMA_PCM and SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent.
--- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/ti/Kconfig +2 -2
@@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like:
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: ti: fix davinci_mcasp_probe dependencies" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: ti: fix davinci_mcasp_probe dependencies
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
7d7b25d05ef1c5a1a9320190e1eeb55534847558Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 4 Mar 2019 21:30:50 +0100
Subject: [PATCH] ASoC: ti: fix davinci_mcasp_probe dependencies
The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways:
- With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y,
is enabled as =m, and we get a link error:
sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'
- When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by another driver, the same link error appears even if CONFIG_TI_EDMA is disabled
There are possibly other issues here, but it seems that the only reasonable solution is to always build both SND_SOC_TI_EDMA_PCM and SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent.
--- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/ti/Kconfig +2 -2
@@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like:
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: ti: fix davinci_mcasp_probe dependencies" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: ti: fix davinci_mcasp_probe dependencies
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
7d7b25d05ef1c5a1a9320190e1eeb55534847558Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 4 Mar 2019 21:30:50 +0100
Subject: [PATCH] ASoC: ti: fix davinci_mcasp_probe dependencies
The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways:
- With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y,
is enabled as =m, and we get a link error:
sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'
- When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by another driver, the same link error appears even if CONFIG_TI_EDMA is disabled
There are possibly other issues here, but it seems that the only reasonable solution is to always build both SND_SOC_TI_EDMA_PCM and SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent.
--- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/ti/Kconfig +2 -2
@@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like:
Signature · 1 line
2.20.1