[PATCH] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[PATCH] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Arnd Bergmann]

The change to enable OMAP5 support on this platform was a little too
eager in adding a 'select' for a particular clock driver that might
not be enabled in all configurations, which in turn leads to a build
error:

warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS)
drivers/built-in.o: In function `palmas_clks_probe':
drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config'

I do not see a strong dependency here, so it's probably better to
drop this select and to avoid adding more complexity here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio")

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index e7c78b0406b5..e74d8db4619d 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -105,7 +105,6 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
 	select SND_OMAP_SOC_MCPDM
 	select SND_SOC_TWL6040
 	select SND_SOC_DMIC
-	select COMMON_CLK_PALMAS if SOC_OMAP5
 	help
 	  Say Y if you want to add support for SoC audio on OMAP boards using
 	  ABE and twl6040 codec. This driver currently supports:

Re: [PATCH] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Peter Ujfalusi]

On 02/25/2015 05:05 PM, Arnd Bergmann wrote:
> The change to enable OMAP5 support on this platform was a little too
> eager in adding a 'select' for a particular clock driver that might
> not be enabled in all configurations, which in turn leads to a build
> error:
> 
> warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS)
> drivers/built-in.o: In function `palmas_clks_probe':
> drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config'
> 
> I do not see a strong dependency here, so it's probably better to
> drop this select and to avoid adding more complexity here.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio")
> 
> diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
> index e7c78b0406b5..e74d8db4619d 100644
> --- a/sound/soc/omap/Kconfig
> +++ b/sound/soc/omap/Kconfig
> @@ -105,7 +105,6 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
>  	select SND_OMAP_SOC_MCPDM
>  	select SND_SOC_TWL6040
>  	select SND_SOC_DMIC
> -	select COMMON_CLK_PALMAS if SOC_OMAP5

Would it be better to have this changed to:
	select COMMON_CLK_PALMAS if MFD_PALMAS
instead of removing.

All OMAP5 boards uses Palmas as PMIC and the boards where twl6040 audio is in
use the 32K clock for the codec is coming from Palmas.
Without this clock the twl6040 will not boot up causing errors during probe time.

>  	help
>  	  Say Y if you want to add support for SoC audio on OMAP boards using
>  	  ABE and twl6040 codec. This driver currently supports:
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


-- 
Péter

[PATCH v2] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Arnd Bergmann]

The change to enable OMAP5 support on this platform was a little too
eager in adding a 'select' for a particular clock driver that might
not be enabled in all configurations, which in turn leads to a build
error:

warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS)
drivers/built-in.o: In function `palmas_clks_probe':
drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config'

I do not see a strong dependency here, so it's probably better to
drop this select and to avoid adding more complexity here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio")
---
v2: change the dependency as suggested by Peter

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index e7c78b0406b5..6768e4f7d7d0 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
 	select SND_OMAP_SOC_MCPDM
 	select SND_SOC_TWL6040
 	select SND_SOC_DMIC
-	select COMMON_CLK_PALMAS if SOC_OMAP5
+	select COMMON_CLK_PALMAS if MFD_PALMAS
 	help
 	  Say Y if you want to add support for SoC audio on OMAP boards using
 	  ABE and twl6040 codec. This driver currently supports:

Re: [PATCH v2] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Peter Ujfalusi]

On 02/25/2015 05:42 PM, Arnd Bergmann wrote:
> The change to enable OMAP5 support on this platform was a little too
> eager in adding a 'select' for a particular clock driver that might
> not be enabled in all configurations, which in turn leads to a build
> error:
> 
> warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS)
> drivers/built-in.o: In function `palmas_clks_probe':
> drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config'
> 
> I do not see a strong dependency here, so it's probably better to
> drop this select and to avoid adding more complexity here.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio")

Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> ---
> v2: change the dependency as suggested by Peter
> 
> diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
> index e7c78b0406b5..6768e4f7d7d0 100644
> --- a/sound/soc/omap/Kconfig
> +++ b/sound/soc/omap/Kconfig
> @@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
>  	select SND_OMAP_SOC_MCPDM
>  	select SND_SOC_TWL6040
>  	select SND_SOC_DMIC
> -	select COMMON_CLK_PALMAS if SOC_OMAP5
> +	select COMMON_CLK_PALMAS if MFD_PALMAS
>  	help
>  	  Say Y if you want to add support for SoC audio on OMAP boards using
>  	  ABE and twl6040 codec. This driver currently supports:
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


-- 
Péter

Re: [PATCH v2] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

On Wed, Feb 25, 2015 at 04:42:12PM +0100, Arnd Bergmann wrote:
> The change to enable OMAP5 support on this platform was a little too
> eager in adding a 'select' for a particular clock driver that might
> not be enabled in all configurations, which in turn leads to a build
> error:

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Arnd Bergmann]

On Wednesday 25 February 2015 17:31:47 Peter Ujfalusi wrote:
> Would it be better to have this changed to:
>         select COMMON_CLK_PALMAS if MFD_PALMAS
> instead of removing.
> 
> All OMAP5 boards uses Palmas as PMIC and the boards where twl6040 audio is in
> use the 32K clock for the codec is coming from Palmas.
> Without this clock the twl6040 will not boot up causing errors during probe time.

It's possible to build a kernel with omap5 support and this driver but
no palmas support, which makes the dependency it a bit strange, but I'll
let Mark decide.

Unfortunately, I've sent the changed v2 patch without fixing up the commit
message. Instead of sending another v3 right away, I'll wait for Mark
to comment.

	Arnd

Re: [PATCH] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

On Wed, Feb 25, 2015 at 04:44:15PM +0100, Arnd Bergmann wrote:

> Unfortunately, I've sent the changed v2 patch without fixing up the commit
> message. Instead of sending another v3 right away, I'll wait for Mark
> to comment.

Well, I wasn't going to look until Peter reviewed it...

Please don't send new patches in reply to existing threads, it makes it
easy for those new patches to get dropped and it can get very hard to
follow what's the current version.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]