[PATCH] ASoC: fsl: fix dependencies for wm8962

[Arnd Bergmann]

The wm8962 driver uses the input subsystem, but is selected by
SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,
resulting in this link error:

ERROR: "input_event" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!
ERROR: "input_register_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!
ERROR: "devm_input_allocate_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!

This adds an explicit Kconfig dependency to prevent this configuration
from being used.

Signed-off-by: Arnd Bergmann <***@arndb.de>
Fixes: 708b4351f08 ("ASoC: fsl: Add Freescale Generic ASoC Sound Card with ASRC support")

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 6164e78b466a..99e9386f7956 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -282,7 +282,7 @@ config SND_SOC_IMX_MC13783

config SND_SOC_FSL_ASOC_CARD
tristate "Generic ASoC Sound Card with ASRC support"
- depends on OF && I2C
+ depends on OF && I2C && INPUT
select SND_SOC_IMX_AUDMUX
select SND_SOC_IMX_PCM_DMA
select SND_SOC_FSL_ESAI

[Mark Brown]

Post by Arnd Bergmann
The wm8962 driver uses the input subsystem, but is selected by
SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,

That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

[Fabio Estevam]

Post by Mark Brown

Post by Arnd Bergmann
The wm8962 driver uses the input subsystem, but is selected by
SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,

That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

Would the below change be a proper fix?

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 6164e78..081e406 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -288,9 +288,6 @@ config SND_SOC_FSL_ASOC_CARD
select SND_SOC_FSL_ESAI
select SND_SOC_FSL_SAI
select SND_SOC_FSL_SSI
- select SND_SOC_CS42XX8_I2C
- select SND_SOC_SGTL5000
- select SND_SOC_WM8962
help
ALSA SoC Audio support with ASRC feature for Freescale SoCs that have
ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888

[Nicolin Chen]

Post by Fabio Estevam

Post by Mark Brown
That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

Would the below change be a proper fix?
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 6164e78..081e406 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
- select SND_SOC_CS42XX8_I2C
- select SND_SOC_SGTL5000
- select SND_SOC_WM8962

Okay..if Mark means this...I think it makes sense to me now.

But in this case, we shall add them into imx_v6_v7_defconfig instead.

Thank you
Nicolin

[Fabio Estevam]

Post by Nicolin Chen

Post by Fabio Estevam

Post by Mark Brown
That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

Would the below change be a proper fix?
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 6164e78..081e406 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
- select SND_SOC_CS42XX8_I2C
- select SND_SOC_SGTL5000
- select SND_SOC_WM8962

Okay..if Mark means this...I think it makes sense to me now.
But in this case, we shall add them into imx_v6_v7_defconfig instead.

We already have
CONFIG_SND_SOC_IMX_WM8962=y
CONFIG_SND_SOC_IMX_SGTL5000=y

in imx_v6_v7_defconfig.

[Nicolin Chen]

Post by Fabio Estevam

Post by Nicolin Chen

Post by Fabio Estevam
- select SND_SOC_CS42XX8_I2C
- select SND_SOC_SGTL5000
- select SND_SOC_WM8962

Okay..if Mark means this...I think it makes sense to me now.
But in this case, we shall add them into imx_v6_v7_defconfig instead.

We already have
CONFIG_SND_SOC_IMX_WM8962=y
CONFIG_SND_SOC_IMX_SGTL5000=y
in imx_v6_v7_defconfig.

Yea, and these are two things I plan to drop...

So when enabling the FSL_ASOC_CARD, I also needs to put those three
into it as well.

[Nicolin Chen]

Post by Mark Brown

Post by Arnd Bergmann
The wm8962 driver uses the input subsystem, but is selected by
SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,

That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

I think I might have missed something around those days, even though
the 'Applied' mail seemly doesn't have any comment against this part:
http://mailman.alsa-project.org/pipermail/alsa-devel/2014-August/080083.html

Is that possible for you to copy and paste the comments again?

Thank you
Nicolin

[Mark Brown]

Post by Nicolin Chen

Post by Mark Brown
That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

I think I might have missed something around those days, even though
http://mailman.alsa-project.org/pipermail/alsa-devel/2014-August/080083.html
Is that possible for you to copy and paste the comments again?

I suspect it was on an earlier version of the patch or a cover letter;
IIRC you were resending while I was reviewing.

[Nicolin Chen]

Post by Mark Brown

Post by Nicolin Chen

Post by Mark Brown
That select shouldn't be there in the first place, I asked Nicolin to
fix this when I applied the driver but he's not got round to it yet.

I think I might have missed something around those days, even though
http://mailman.alsa-project.org/pipermail/alsa-devel/2014-August/080083.html
Is that possible for you to copy and paste the comments again?

I suspect it was on an earlier version of the patch or a cover letter;
IIRC you were resending while I was reviewing.

I checked the Archive, the patch only got one version without cover
letter. And this version only got one reply which is the Applied mail.
I guess your earlier reply might have been swallowed somehow so I
couldn't read it.

Anyway, it's my fault that I didn't pay attention to the Kconfig part.
The driver is initially designed for imx-cs42888, but I changed my mind
to merge it with others before I sent it. And I didn't rewrite the part
inside the Kconfig. Will be careful next time.

And I think Fabio's suggestion/patch has no problem right?

Thank you
Nicolin

[Mark Brown]

Post by Nicolin Chen
I checked the Archive, the patch only got one version without cover
letter. And this version only got one reply which is the Applied mail.
I guess your earlier reply might have been swallowed somehow so I
couldn't read it.

No, there were definitely at least two versions.

Post by Nicolin Chen
And I think Fabio's suggestion/patch has no problem right?

That is the fix I was asking for.

[Nicolin Chen]

Post by Mark Brown

Post by Nicolin Chen
I checked the Archive, the patch only got one version without cover
letter. And this version only got one reply which is the Applied mail.
I guess your earlier reply might have been swallowed somehow so I
couldn't read it.

No, there were definitely at least two versions.

Sorry if I've really missed something.

And I still can't find any other reply. I sent the patch with
a RFC tag, so I wouldn't ignore any comment to it, especially
the comment from you sir.

Post by Mark Brown

Post by Nicolin Chen
And I think Fabio's suggestion/patch has no problem right?

That is the fix I was asking for.

Is there any other comment against the driver you can remember?

Thank you
Nicolin