diff options
| author | Gopikrishnaiah Anandan <agopik@codeaurora.org> | 2013-04-17 17:50:49 -0400 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2013-09-04 16:42:39 -0700 |
| commit | 54fb089e65beca4823b49c3800d8c23e188f08b3 (patch) | |
| tree | adf185aa7e98ff5a5f464727d6b54369e888e882 | |
| parent | a062ea9f3e2c52d16a1deabaeb65c0dcd77d9a0b (diff) | |
ASoC: msm: 8974: Fix HDMI audio enable criteria
HDMI audio feature should be disabled if hdmi panel is not
enabled on the platform. This change ensures that HDMI audio
is enabled only when HDMI panel is present.
CRs-fixed: 476010
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
Change-Id: I6779a9b2afa763b7a78b5e9f8be1f8b230298830
| -rw-r--r-- | sound/soc/codecs/Kconfig | 6 | ||||
| -rw-r--r-- | sound/soc/codecs/Makefile | 3 | ||||
| -rw-r--r-- | sound/soc/msm/Kconfig | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 3b2088789947..47fab8ae1255 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -544,4 +544,8 @@ config SND_SOC_MSM_STUB tristate config SND_SOC_MSM_HDMI_CODEC_RX - tristate + bool "HDMI Audio Playback" + depends on FB_MSM_MDSS_HDMI_PANEL && SND_SOC_MSM8974 + help + HDMI audio drivers should be built only if the platform + supports hdmi panel. diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 2b79121a451d..81accb67c8ca 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -127,7 +127,7 @@ snd-soc-wm-hubs-objs := wm_hubs.o snd-soc-timpani-objs := timpani.o snd-soc-msm-stub-objs := msm_stub.o -snd-soc-msm-hdmi-rx-objs := msm_hdmi_codec_rx.o +obj-$(CONFIG_SND_SOC_MSM_HDMI_CODEC_RX) := msm_hdmi_codec_rx.o # Amp snd-soc-max9877-objs := max9877.o @@ -259,7 +259,6 @@ obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_WM_ADSP) += snd-soc-wm-adsp.o obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o obj-$(CONFIG_SND_SOC_MSM_STUB) += snd-soc-msm-stub.o -obj-$(CONFIG_SND_SOC_MSM_HDMI_CODEC_RX) += snd-soc-msm-hdmi-rx.o # Amp obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig index 66c475ff2613..7fd62f1e3b69 100644 --- a/sound/soc/msm/Kconfig +++ b/sound/soc/msm/Kconfig @@ -180,7 +180,6 @@ config SND_SOC_MSM8974 select SND_SOC_MSM_STUB select SND_SOC_MSM_HOSTLESS_PCM select SND_SOC_WCD9320 - select SND_SOC_MSM_HDMI_CODEC_RX select SND_DYNAMIC_MINORS select AUDIO_OCMEM select DOLBY_DAP |