summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
diff options
context:
space:
mode:
authorRicardo Neri <ricardo.neri@ti.com>2012-03-15 14:08:03 -0600
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-11 15:15:22 +0300
commit7e151f7f6abdd75831797ae45ec2aa3d0a648416 (patch)
treeb74dea57e63e80735732b812aa29e835c532a3ad /drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
parent3df9fb5c51ca617e410da890f631100ea9f10652 (diff)
OMAPDSS: HDMI: Decouple HDMI audio from ASoC
Instead of having OMAPDSS HDMI audio functionality depending on the ASoC HDMI audio driver, use a new config option so that potential users, including ASoC, may select if needed. Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h')
-rw-r--r--drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
index ffc08da89ce..914be3dbf71 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
@@ -435,8 +435,7 @@ struct hdmi_core_audio_config {
bool en_spdif;
};
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
- defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
u32 sample_freq, u32 *n, u32 *cts);
void hdmi_core_audio_infoframe_config(struct hdmi_ip_data *ip_data,