summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-02-23 11:22:02 -0600
committerJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-06-17 18:26:56 -0500
commitba5d58a07e3e9fdc2da489d2923cd94d3bde8e28 (patch)
treec7d2a2d56bf187949c3294c0dcdf2638c8dadfab
parent65394ca6646b677a908592817e30027b5efe3f1a (diff)
ARM: OMAP4: Enable HDMI audio by default in defconfig
Update omap_4430sdp_defconfig to enable HDMI audio by default. Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com> Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
-rw-r--r--arch/arm/configs/omap_4430sdp_defconfig1
-rw-r--r--sound/soc/omap/Kconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index d64b4dfebcf7..2e2e81aaf1a0 100644
--- a/arch/arm/configs/omap_4430sdp_defconfig
+++ b/arch/arm/configs/omap_4430sdp_defconfig
@@ -894,6 +894,7 @@ CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_MCPDM=y
CONFIG_SND_OMAP_SOC_SDP4430=y
+CONFIG_SND_OMAP_SOC_HDMI=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_TWL6040=y
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 90f8aef79028..42f0115dad76 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -103,7 +103,7 @@ config SND_OMAP_SOC_SDP4430
config SND_OMAP_SOC_HDMI
tristate "SoC Audio support for HDMI interface on SDP4430"
- depends on SND_OMAP_SOC_SDP4430
+ depends on SND_OMAP_SOC_SDP4430 && OMAP2_DSS_HDMI
help
Say Y if you want to add support for HDMI interface on SDP4430