by Robert Jarzmik

[permalink] [raw]

Subject: Re: [PATCH v4 09/12] ASoC: wm9712: add ac97 new bus support

Charles Keepax <[email protected]> writes:

> On Mon, Jul 24, 2017 at 10:49:25PM +0200, Robert Jarzmik wrote:
>> Add support for the new ac97 bus model, where devices are automatically
>> discovered on AC-Links.
>>
>> Signed-off-by: Robert Jarzmik <[email protected]>
>> ---
>> + } else {
>> + wm9712->ac97 = snd_soc_new_ac97_codec(codec, WM9712_VENDOR_ID,
>> + WM9712_VENDOR_ID_MASK);
>> + if (IS_ERR(wm9712->ac97)) {
>> + ret = PTR_ERR(wm9712->ac97);
>> + dev_err(codec->dev,
>> + "Failed to register AC97 codec: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + regmap = regmap_init_ac97(wm9712->ac97, &wm9712_regmap_config);
>> + if (IS_ERR(regmap)) {
>> + ret = PTR_ERR(regmap);
>> + goto err_free_ac97_codec;
>
> For the 9713 you had this wrapped in an ifdef? Why did it need an
> ifdef there but doesn't for this driver?
I have forgotten the ifdef, it's a very good catch, thanks.
The trick is that in :
- include/sound/soc.h
- snd_soc_new_ac97_codec() is only defined under this ifdef

And with the new ac97 bus support, these drivers can be compiled now with
CONFIG_SND_SOC_AC97_BUS not defined, so I need to add the ifdef.

Cheers.

--
Robert

2017-09-04 17:27:58

by Mark Brown

[permalink] [raw]

Subject: Applied "ASoC: add new ac97 bus support" to the asoc tree

The patch

ASoC: add new ac97 bus support

has been applied to the asoc tree at

git://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

>From 8d43344108c9945456128b75b69beee594b64ed6 Mon Sep 17 00:00:00 2001
From: Robert Jarzmik <[email protected]>
Date: Sat, 2 Sep 2017 21:54:05 +0200
Subject: [PATCH] ASoC: add new ac97 bus support

Add the new ac97 bus support, with ac97 bus automatic probing.

Signed-off-by: Robert Jarzmik <[email protected]>
Acked-by: Charles Keepax <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
sound/Kconfig | 2 ++
sound/Makefile | 1 +
2 files changed, 3 insertions(+)

diff --git a/sound/Kconfig b/sound/Kconfig
index d7d2aac9542e..ed34218d38b8 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -80,6 +80,8 @@ source "sound/hda/Kconfig"

source "sound/ppc/Kconfig"

+source "sound/ac97/Kconfig"
+
source "sound/aoa/Kconfig"

source "sound/arm/Kconfig"
diff --git a/sound/Makefile b/sound/Makefile
index 6de45d2c32f7..c03b0bed65d5 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SND_AOA) += aoa/

# This one must be compilable even if sound is configured out
obj-$(CONFIG_AC97_BUS) += ac97_bus.o
+obj-$(CONFIG_AC97_BUS_NEW) += ac97/

ifeq ($(CONFIG_SND),y)
obj-y += last.o
--
2.14.1