[PATCH] ASoC: OMAP4: HDMI: Make stricter dependency on OMAP2_DSS

[PATCH] ASoC: OMAP4: HDMI: Make stricter dependency on OMAP2_DSS

[Ricardo Neri]

When building DSS HDMI driver with audio support, there is dependency
on SND_SOC to register the ASoC audio codec. Also, SND_OMAP_SOC_OMAP4_HDMI
has dependency on OMAP2_DSS. Then, to avoid build breakages,
SND_OMAP_SOC_OMAP4_HDMI, is restricted to be available only when
OMAP2_DSS AND SND_SOC have the same build type.

Also, dependency on ARCH_OMAP4 is removed, as it is checked indirectly
by OMAP4_DSS_HDMI.

Reported-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
---
 sound/soc/omap/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index e8ca5be..ffbd83f 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -113,7 +113,7 @@ config SND_OMAP_SOC_SDP4430
 
 config SND_OMAP_SOC_OMAP4_HDMI
 	tristate "SoC Audio support for Texas Instruments OMAP4 HDMI"
-	depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS && ARCH_OMAP4
+	depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && (OMAP2_DSS = SND_SOC)
 	select SND_OMAP_SOC_HDMI
 	help
 	  Say Y if you want to add support for SoC HDMI audio on Texas Instruments
-- 
1.7.4.1

Re: [PATCH] ASoC: OMAP4: HDMI: Make stricter dependency on OMAP2_DSS

[Mark Brown]

On Thu, Jul 07, 2011 at 03:38:54PM -0500, Ricardo Neri wrote:
> When building DSS HDMI driver with audio support, there is dependency
> on SND_SOC to register the ASoC audio codec. Also, SND_OMAP_SOC_OMAP4_HDMI
> has dependency on OMAP2_DSS. Then, to avoid build breakages,
> SND_OMAP_SOC_OMAP4_HDMI, is restricted to be available only when
> OMAP2_DSS AND SND_SOC have the same build type.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Re: [PATCH] ASoC: OMAP4: HDMI: Make stricter dependency on OMAP2_DSS

[Liam Girdwood]

On Thu, 2011-07-07 at 15:38 -0500, Ricardo Neri wrote:
> When building DSS HDMI driver with audio support, there is dependency
> on SND_SOC to register the ASoC audio codec. Also, SND_OMAP_SOC_OMAP4_HDMI
> has dependency on OMAP2_DSS. Then, to avoid build breakages,
> SND_OMAP_SOC_OMAP4_HDMI, is restricted to be available only when
> OMAP2_DSS AND SND_SOC have the same build type.
> 
> Also, dependency on ARCH_OMAP4 is removed, as it is checked indirectly
> by OMAP4_DSS_HDMI.
> 
> Reported-by: Liam Girdwood <lrg@ti.com>
> Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
> ---

Applied