diff options
| author | Ricardo Neri <ricardo.neri@ti.com> | 2012-03-15 16:08:03 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-11 08:15:22 -0400 |
| commit | 7e151f7f6abdd75831797ae45ec2aa3d0a648416 (patch) | |
| tree | b74dea57e63e80735732b812aa29e835c532a3ad /drivers/video/omap2/dss/dss_features.c | |
| parent | 3df9fb5c51ca617e410da890f631100ea9f10652 (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/dss_features.c')
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 13b45af5e89d..1c939fb6debc 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c | |||
| @@ -573,8 +573,7 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = { | |||
| 573 | .dump_core = ti_hdmi_4xxx_core_dump, | 573 | .dump_core = ti_hdmi_4xxx_core_dump, |
| 574 | .dump_pll = ti_hdmi_4xxx_pll_dump, | 574 | .dump_pll = ti_hdmi_4xxx_pll_dump, |
| 575 | .dump_phy = ti_hdmi_4xxx_phy_dump, | 575 | .dump_phy = ti_hdmi_4xxx_phy_dump, |
| 576 | #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \ | 576 | #if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) |
| 577 | defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE) | ||
| 578 | .audio_enable = ti_hdmi_4xxx_wp_audio_enable, | 577 | .audio_enable = ti_hdmi_4xxx_wp_audio_enable, |
| 579 | .audio_disable = ti_hdmi_4xxx_wp_audio_disable, | 578 | .audio_disable = ti_hdmi_4xxx_wp_audio_disable, |
| 580 | .audio_start = ti_hdmi_4xxx_audio_start, | 579 | .audio_start = ti_hdmi_4xxx_audio_start, |