* [PATCH] ASoC: improve RT5514 dependencies
@ 2017-07-31 8:30 Arnd Bergmann
2017-07-31 9:15 ` Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-07-31 8:30 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown
Cc: alsa-devel, Ryder Lee, Hsin-yu Chao, Arnd Bergmann,
linux-rockchip, Harsha Priya N, linux-kernel, Takashi Iwai,
Sugar Zhang, Vinod Koul, linux-mediatek, Matthias Brugger,
Naveen M, Charles Keepax, Xing Zheng, linux-arm-kernel,
Heiko Stuebner
With SND_SOC_RT5514_SPI=m and SND_SOC_RT5514=y, we get this link error:
sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put':
rt5514.c:(.text+0x2068): undefined reference to `rt5514_spi_burst_write'
rt5514.c:(.text+0x20c8): undefined reference to `rt5514_spi_burst_write'
This adds another Kconfig symbol to work around the link error, forcing
the main driver to be a loadable module as well if some other driver
selects the I2C side to be built-in.
Fixes: 2a18483a7fb4 ("ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
This can now lead to a configuration with
SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=y and SND_SOC_RT5514=m. I
don't know if that is a problem or not.
An alternative approach would be to flip the dependency between
rt5514_spi.ko and rt5514.ko and avoid having the rt5514_spi_burst_write
symbol exported.
---
sound/soc/codecs/Kconfig | 7 ++++++-
sound/soc/intel/Kconfig | 2 +-
sound/soc/mediatek/Kconfig | 2 +-
sound/soc/rockchip/Kconfig | 1 -
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 024ddc9938ed..115c6144ca2a 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -117,7 +117,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_RT274 if I2C
select SND_SOC_RT286 if I2C
select SND_SOC_RT298 if I2C
- select SND_SOC_RT5514 if I2C
+ select SND_SOC_RT5514_I2C if I2C
select SND_SOC_RT5616 if I2C
select SND_SOC_RT5631 if I2C
select SND_SOC_RT5640 if I2C
@@ -738,6 +738,11 @@ config SND_SOC_RT298
config SND_SOC_RT5514
tristate
+ default m if SND_SOC_RT5514_SPI=m
+ default SND_SOC_RT5514_I2C || SND_SOC_RT5514_SPI
+
+config SND_SOC_RT5514_I2C
+ tristate
config SND_SOC_RT5514_SPI
tristate
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b301bfff1c09..f5ef912190ed 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -259,7 +259,7 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
- select SND_SOC_RT5514
+ select SND_SOC_RT5514_I2C
select SND_SOC_MAX98927
select SND_SOC_HDAC_HDMI
help
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig
index 5c68797f36c4..6ccf73ae77ca 100644
--- a/sound/soc/mediatek/Kconfig
+++ b/sound/soc/mediatek/Kconfig
@@ -67,7 +67,7 @@ config SND_SOC_MT8173_RT5650_RT5514
tristate "ASoC Audio driver for MT8173 with RT5650 RT5514 codecs"
depends on SND_SOC_MT8173 && I2C
select SND_SOC_RT5645
- select SND_SOC_RT5514
+ select SND_SOC_RT5514_I2C
help
This adds ASoC driver for Mediatek MT8173 boards
with the RT5650 and RT5514 codecs.
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index c84487805876..c1139aecdfbe 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -65,7 +65,6 @@ config SND_SOC_RK3399_GRU_SOUND
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI
select SND_SOC_ROCKCHIP_I2S
select SND_SOC_MAX98357A
- select SND_SOC_RT5514
select SND_SOC_DA7219
select SND_SOC_RT5514_SPI
help
--
2.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: improve RT5514 dependencies
2017-07-31 8:30 [PATCH] ASoC: improve RT5514 dependencies Arnd Bergmann
@ 2017-07-31 9:15 ` Takashi Iwai
2017-07-31 9:45 ` Arnd Bergmann
2017-08-01 14:21 ` Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Takashi Iwai @ 2017-07-31 9:15 UTC (permalink / raw)
To: Arnd Bergmann
Cc: alsa-devel, Ryder Lee, Hsin-yu Chao, Xing Zheng, linux-rockchip,
Harsha Priya N, linux-kernel, Liam Girdwood, Sugar Zhang,
Vinod Koul, Mark Brown, linux-mediatek, Matthias Brugger,
Naveen M, Charles Keepax, linux-arm-kernel, Heiko Stuebner
On Mon, 31 Jul 2017 10:30:55 +0200,
Arnd Bergmann wrote:
>
> With SND_SOC_RT5514_SPI=m and SND_SOC_RT5514=y, we get this link error:
>
> sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put':
> rt5514.c:(.text+0x2068): undefined reference to `rt5514_spi_burst_write'
> rt5514.c:(.text+0x20c8): undefined reference to `rt5514_spi_burst_write'
>
> This adds another Kconfig symbol to work around the link error, forcing
> the main driver to be a loadable module as well if some other driver
> selects the I2C side to be built-in.
>
> Fixes: 2a18483a7fb4 ("ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> This can now lead to a configuration with
> SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=y and SND_SOC_RT5514=m. I
> don't know if that is a problem or not.
>
> An alternative approach would be to flip the dependency between
> rt5514_spi.ko and rt5514.ko and avoid having the rt5514_spi_burst_write
> symbol exported.
The current usage of
#if defined(CONFIG_SND_SOC_RT5514_SPI)
in rt5514_dsp_voice_wake_up_put() is already broken. We need the fix
in anyway.
IMO, flipping the dependency looks saner to me. The SPI function call
is a kind of add-on, after all.
thanks,
Takashi
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: improve RT5514 dependencies
2017-07-31 9:15 ` Takashi Iwai
@ 2017-07-31 9:45 ` Arnd Bergmann
2017-08-01 14:21 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2017-07-31 9:45 UTC (permalink / raw)
To: Takashi Iwai
Cc: Liam Girdwood, Mark Brown, alsa-devel, Matthias Brugger,
Hsin-yu Chao, Harsha Priya N, Naveen M, Vinod Koul, Linux ARM,
moderated list:ARM/Mediatek SoC...,
open list:ARM/Rockchip SoC support, Ryder Lee, Charles Keepax,
Jaroslav Kysela, Sugar Zhang, Xing Zheng, Heiko Stuebner
On Mon, Jul 31, 2017 at 11:15 AM, Takashi Iwai <tiwai@suse.de> wrote:
> On Mon, 31 Jul 2017 10:30:55 +0200,
> Arnd Bergmann wrote:
>>
>> With SND_SOC_RT5514_SPI=m and SND_SOC_RT5514=y, we get this link error:
>>
>> sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put':
>> rt5514.c:(.text+0x2068): undefined reference to `rt5514_spi_burst_write'
>> rt5514.c:(.text+0x20c8): undefined reference to `rt5514_spi_burst_write'
>>
>> This adds another Kconfig symbol to work around the link error, forcing
>> the main driver to be a loadable module as well if some other driver
>> selects the I2C side to be built-in.
>>
>> Fixes: 2a18483a7fb4 ("ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> This can now lead to a configuration with
>> SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=y and SND_SOC_RT5514=m. I
>> don't know if that is a problem or not.
>>
>> An alternative approach would be to flip the dependency between
>> rt5514_spi.ko and rt5514.ko and avoid having the rt5514_spi_burst_write
>> symbol exported.
>
> The current usage of
> #if defined(CONFIG_SND_SOC_RT5514_SPI)
> in rt5514_dsp_voice_wake_up_put() is already broken. We need the fix
> in anyway.
>
> IMO, flipping the dependency looks saner to me. The SPI function call
> is a kind of add-on, after all.
Ok. I'll leave that up to the maintainers of the codec driver then.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: improve RT5514 dependencies
2017-07-31 9:15 ` Takashi Iwai
2017-07-31 9:45 ` Arnd Bergmann
@ 2017-08-01 14:21 ` Mark Brown
2017-09-05 9:03 ` Arnd Bergmann
1 sibling, 1 reply; 5+ messages in thread
From: Mark Brown @ 2017-08-01 14:21 UTC (permalink / raw)
To: Takashi Iwai
Cc: alsa-devel, Ryder Lee, Hsin-yu Chao, Arnd Bergmann,
linux-rockchip, Harsha Priya N, linux-kernel, Liam Girdwood,
Jaroslav Kysela, Sugar Zhang, Vinod Koul, linux-mediatek,
Matthias Brugger, Naveen M, Charles Keepax, Xing Zheng,
linux-arm-kernel, Heiko Stuebner
[-- Attachment #1.1: Type: text/plain, Size: 221 bytes --]
On Mon, Jul 31, 2017 at 11:15:57AM +0200, Takashi Iwai wrote:
> IMO, flipping the dependency looks saner to me. The SPI function call
> is a kind of add-on, after all.
Yes, that's definitely the intention of the code.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ASoC: improve RT5514 dependencies
2017-08-01 14:21 ` Mark Brown
@ 2017-09-05 9:03 ` Arnd Bergmann
0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2017-09-05 9:03 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Ryder Lee, Hsin-yu Chao, Xing Zheng,
open list:ARM/Rockchip SoC support, Takashi Iwai,
Linux Kernel Mailing List, Liam Girdwood, Jaroslav Kysela,
Sugar Zhang, Harsha Priya N, moderated list:ARM/Mediatek SoC...,
Matthias Brugger, Naveen M, Charles Keepax, Vinod Koul, Linux ARM,
Heiko Stuebner
On Tue, Aug 1, 2017 at 4:21 PM, Mark Brown <broonie@kernel.org> wrote:
> On Mon, Jul 31, 2017 at 11:15:57AM +0200, Takashi Iwai wrote:
>
>> IMO, flipping the dependency looks saner to me. The SPI function call
>> is a kind of add-on, after all.
>
> Yes, that's definitely the intention of the code.
I just ran into the same problem again on randconfig testing, after
the bug had been
gone before my vacation:
sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put':
rt5514.c:(.text+0x2068): undefined reference to `rt5514_spi_burst_write'
rt5514.c:(.text+0x20c8): undefined reference to `rt5514_spi_burst_write'
Is anyone looking into this? My original patch
(https://patchwork.kernel.org/patch/9871255/) still fixes it but needs a
minor change to apply now. When I last looked into changing
the dependency in the code, I couldn't quite figure out how to
do it there.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-09-05 9:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-31 8:30 [PATCH] ASoC: improve RT5514 dependencies Arnd Bergmann
2017-07-31 9:15 ` Takashi Iwai
2017-07-31 9:45 ` Arnd Bergmann
2017-08-01 14:21 ` Mark Brown
2017-09-05 9:03 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox