[07/12] OMAPDSS: Kconfig: Select audio dependencies if OMAP5_DSS_HDMI_AUDIO=y
diff mbox

Message ID 67ea660311de39b8a35e90a9a7d3b345fdaaf895.1403807781.git.jsarha@ti.com
State New, archived
Headers show

Commit Message

Jyri Sarha June 26, 2014, 7:20 p.m. UTC
Adds help section and SND_SOC dependency to OMAP4_DSS_HDMI_AUDIO.
Selects SND_OMAP_SOC, SND_SOC_HDMI_CODEC, and SND_SIMPLE_CARD if
OMAP4_DSS_HDMI_AUDIO is enabled.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
---
 drivers/video/fbdev/omap2/dss/Kconfig |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Comments

Tomi Valkeinen June 27, 2014, 11:49 a.m. UTC | #1
On 26/06/14 22:20, Jyri Sarha wrote:
> Adds help section and SND_SOC dependency to OMAP4_DSS_HDMI_AUDIO.
> Selects SND_OMAP_SOC, SND_SOC_HDMI_CODEC, and SND_SIMPLE_CARD if
> OMAP4_DSS_HDMI_AUDIO is enabled.
> 
> Signed-off-by: Jyri Sarha <jsarha@ti.com>
> ---
>  drivers/video/fbdev/omap2/dss/Kconfig |   16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/video/fbdev/omap2/dss/Kconfig b/drivers/video/fbdev/omap2/dss/Kconfig
> index 871f722..1cce26c 100644
> --- a/drivers/video/fbdev/omap2/dss/Kconfig
> +++ b/drivers/video/fbdev/omap2/dss/Kconfig
> @@ -6,9 +6,9 @@ menuconfig OMAP2_DSS
>  	select VIDEOMODE_HELPERS
>  	select OMAP2_DSS_INIT
>  	select HDMI
> -	select SND_OMAP_SOC if OMAP4_DSS_HDMI_AUDIO
> -	select SND_SOC_HDMI_CODEC if OMAP4_DSS_HDMI_AUDIO
> -	select SND_SIMPLE_CARD if OMAP4_DSS_HDMI_AUDIO
> +	select SND_OMAP_SOC if OMAP4_DSS_HDMI_AUDIO || OMAP5_DSS_HDMI_AUDIO
> +	select SND_SOC_HDMI_CODEC if OMAP4_DSS_HDMI_AUDIO || OMAP5_DSS_HDMI_AUDIO
> +	select SND_SIMPLE_CARD if OMAP4_DSS_HDMI_AUDIO || OMAP5_DSS_HDMI_AUDIO
>          help
>  	  OMAP2+ Display Subsystem support.
>  
> @@ -99,8 +99,16 @@ config OMAP5_DSS_HDMI
>  	  specification.
>  
>  config OMAP5_DSS_HDMI_AUDIO
> +	bool "HDMI audio support for OMAP5"
>  	depends on OMAP5_DSS_HDMI
> -	bool
> +	depends on SND_SOC=y || OMAP2_DSS = SND_SOC
> +	default y

These selects and depends ons make me feel a bit uneasy, but I don't
have any idea how to deal with it in a nicer way...

 Tomi

Patch
diff mbox

diff --git a/drivers/video/fbdev/omap2/dss/Kconfig b/drivers/video/fbdev/omap2/dss/Kconfig
index 871f722..1cce26c 100644
--- a/drivers/video/fbdev/omap2/dss/Kconfig
+++ b/drivers/video/fbdev/omap2/dss/Kconfig
@@ -6,9 +6,9 @@  menuconfig OMAP2_DSS
 	select VIDEOMODE_HELPERS
 	select OMAP2_DSS_INIT
 	select HDMI
-	select SND_OMAP_SOC if OMAP4_DSS_HDMI_AUDIO
-	select SND_SOC_HDMI_CODEC if OMAP4_DSS_HDMI_AUDIO
-	select SND_SIMPLE_CARD if OMAP4_DSS_HDMI_AUDIO
+	select SND_OMAP_SOC if OMAP4_DSS_HDMI_AUDIO || OMAP5_DSS_HDMI_AUDIO
+	select SND_SOC_HDMI_CODEC if OMAP4_DSS_HDMI_AUDIO || OMAP5_DSS_HDMI_AUDIO
+	select SND_SIMPLE_CARD if OMAP4_DSS_HDMI_AUDIO || OMAP5_DSS_HDMI_AUDIO
         help
 	  OMAP2+ Display Subsystem support.
 
@@ -99,8 +99,16 @@  config OMAP5_DSS_HDMI
 	  specification.
 
 config OMAP5_DSS_HDMI_AUDIO
+	bool "HDMI audio support for OMAP5"
 	depends on OMAP5_DSS_HDMI
-	bool
+	depends on SND_SOC=y || OMAP2_DSS = SND_SOC
+	default y
+	help
+	  HDMI audio support for OMAP5 based SoCs. Adds integrated
+	  ASoC Digital Audio Interface component driver into OMAPDSS
+	  module. If enabled OMAP2_DSS selects SND_OMAP_SOC,
+	  SND_SOC_HDMI_CODEC, and SND_SIMPLE_CARD for full HDMI
+	  audio support.
 
 config OMAP2_DSS_SDI
 	bool "SDI support"