* [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency
@ 2020-04-28 21:26 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2020-04-28 21:26 UTC (permalink / raw)
To: Mark Brown
Cc: Arnd Bergmann, Randy Dunlap, Geert Uytterhoeven, Liam Girdwood,
Jaroslav Kysela, Takashi Iwai, Charles Keepax,
Richard Fitzgerald, alsa-devel, linux-kernel
A recent build fix got the dependency slightly wrong, breaking
builds with CONFIG_AC97_BUS_NEW:
WARNING: unmet direct dependencies detected for SND_SOC_WM9713
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
Selected by [m]:
- SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n
WARNING: unmet direct dependencies detected for SND_SOC_WM9712
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
Selected by [m]:
- SND_PXA2XX_SOC_EM_X270 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && (MACH_EM_X270 [=n] || MACH_EXEDA [=n] || MACH_CM_X300 [=y]) && AC97_BUS [=n]=n
Change the dependency to allow either version of the AC97 library
code.
Fixes: 5a309875787d ("ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/codecs/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 1de97680858f..d911956c591d 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1626,19 +1626,19 @@ config SND_SOC_WM9090
config SND_SOC_WM9705
tristate
- depends on SND_SOC_AC97_BUS
+ depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
select REGMAP_AC97
select AC97_BUS_COMPAT if AC97_BUS_NEW
config SND_SOC_WM9712
tristate
- depends on SND_SOC_AC97_BUS
+ depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
select REGMAP_AC97
select AC97_BUS_COMPAT if AC97_BUS_NEW
config SND_SOC_WM9713
tristate
- depends on SND_SOC_AC97_BUS
+ depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
select REGMAP_AC97
select AC97_BUS_COMPAT if AC97_BUS_NEW
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency
@ 2020-04-28 21:26 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2020-04-28 21:26 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Charles Keepax, Arnd Bergmann, linux-kernel,
Randy Dunlap, Takashi Iwai, Liam Girdwood, Geert Uytterhoeven,
Richard Fitzgerald
A recent build fix got the dependency slightly wrong, breaking
builds with CONFIG_AC97_BUS_NEW:
WARNING: unmet direct dependencies detected for SND_SOC_WM9713
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
Selected by [m]:
- SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n
WARNING: unmet direct dependencies detected for SND_SOC_WM9712
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
Selected by [m]:
- SND_PXA2XX_SOC_EM_X270 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && (MACH_EM_X270 [=n] || MACH_EXEDA [=n] || MACH_CM_X300 [=y]) && AC97_BUS [=n]=n
Change the dependency to allow either version of the AC97 library
code.
Fixes: 5a309875787d ("ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/codecs/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 1de97680858f..d911956c591d 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1626,19 +1626,19 @@ config SND_SOC_WM9090
config SND_SOC_WM9705
tristate
- depends on SND_SOC_AC97_BUS
+ depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
select REGMAP_AC97
select AC97_BUS_COMPAT if AC97_BUS_NEW
config SND_SOC_WM9712
tristate
- depends on SND_SOC_AC97_BUS
+ depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
select REGMAP_AC97
select AC97_BUS_COMPAT if AC97_BUS_NEW
config SND_SOC_WM9713
tristate
- depends on SND_SOC_AC97_BUS
+ depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
select REGMAP_AC97
select AC97_BUS_COMPAT if AC97_BUS_NEW
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency
2020-04-28 21:26 ` Arnd Bergmann
@ 2020-04-29 8:47 ` Charles Keepax
-1 siblings, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2020-04-29 8:47 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Randy Dunlap, Geert Uytterhoeven, Liam Girdwood,
Jaroslav Kysela, Takashi Iwai, Richard Fitzgerald, alsa-devel,
linux-kernel
On Tue, Apr 28, 2020 at 11:26:59PM +0200, Arnd Bergmann wrote:
> A recent build fix got the dependency slightly wrong, breaking
> builds with CONFIG_AC97_BUS_NEW:
>
> WARNING: unmet direct dependencies detected for SND_SOC_WM9713
> Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
> Selected by [m]:
> - SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n
>
> WARNING: unmet direct dependencies detected for SND_SOC_WM9712
> Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
> Selected by [m]:
> - SND_PXA2XX_SOC_EM_X270 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && (MACH_EM_X270 [=n] || MACH_EXEDA [=n] || MACH_CM_X300 [=y]) && AC97_BUS [=n]=n
>
> Change the dependency to allow either version of the AC97 library
> code.
>
> Fixes: 5a309875787d ("ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency
@ 2020-04-29 8:47 ` Charles Keepax
0 siblings, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2020-04-29 8:47 UTC (permalink / raw)
To: Arnd Bergmann
Cc: alsa-devel, Liam Girdwood, linux-kernel, Randy Dunlap,
Takashi Iwai, Mark Brown, Geert Uytterhoeven, Richard Fitzgerald
On Tue, Apr 28, 2020 at 11:26:59PM +0200, Arnd Bergmann wrote:
> A recent build fix got the dependency slightly wrong, breaking
> builds with CONFIG_AC97_BUS_NEW:
>
> WARNING: unmet direct dependencies detected for SND_SOC_WM9713
> Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
> Selected by [m]:
> - SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n
>
> WARNING: unmet direct dependencies detected for SND_SOC_WM9712
> Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
> Selected by [m]:
> - SND_PXA2XX_SOC_EM_X270 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && (MACH_EM_X270 [=n] || MACH_EXEDA [=n] || MACH_CM_X300 [=y]) && AC97_BUS [=n]=n
>
> Change the dependency to allow either version of the AC97 library
> code.
>
> Fixes: 5a309875787d ("ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency
2020-04-28 21:26 ` Arnd Bergmann
@ 2020-04-29 16:26 ` Mark Brown
-1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-04-29 16:26 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Takashi Iwai, linux-kernel, Randy Dunlap, alsa-devel,
Liam Girdwood, Charles Keepax, Richard Fitzgerald,
Geert Uytterhoeven
On Tue, 28 Apr 2020 23:26:59 +0200, Arnd Bergmann wrote:
> A recent build fix got the dependency slightly wrong, breaking
> builds with CONFIG_AC97_BUS_NEW:
>
> WARNING: unmet direct dependencies detected for SND_SOC_WM9713
> Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
> Selected by [m]:
> - SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8
Thanks!
[1/1] ASoC: codecs: wm97xx: fix ac97 dependency
commit: ee2cbe06935bfa58f1fe07dc2a2283945f4b97dc
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] 6+ messages in thread* Re: [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency
@ 2020-04-29 16:26 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-04-29 16:26 UTC (permalink / raw)
To: Arnd Bergmann
Cc: alsa-devel, Charles Keepax, linux-kernel, Randy Dunlap,
Liam Girdwood, Takashi Iwai, Geert Uytterhoeven,
Richard Fitzgerald
On Tue, 28 Apr 2020 23:26:59 +0200, Arnd Bergmann wrote:
> A recent build fix got the dependency slightly wrong, breaking
> builds with CONFIG_AC97_BUS_NEW:
>
> WARNING: unmet direct dependencies detected for SND_SOC_WM9713
> Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
> Selected by [m]:
> - SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8
Thanks!
[1/1] ASoC: codecs: wm97xx: fix ac97 dependency
commit: ee2cbe06935bfa58f1fe07dc2a2283945f4b97dc
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] 6+ messages in thread
end of thread, other threads:[~2020-04-29 16:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-28 21:26 [PATCH] ASoC: codecs: wm97xx: fix ac97 dependency Arnd Bergmann
2020-04-28 21:26 ` Arnd Bergmann
2020-04-29 8:47 ` Charles Keepax
2020-04-29 8:47 ` Charles Keepax
2020-04-29 16:26 ` Mark Brown
2020-04-29 16:26 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.