diff options
| author | Andy Green <andy.green@linaro.org> | 2011-07-24 21:00:13 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-08-25 07:38:18 +0100 |
| commit | 3c15413be2ef9add6e8a1b09cf05f98cfb230e3a (patch) | |
| tree | 11c17f1ba34e60c046aba53421741ed47f547ded /sound | |
| parent | 588e129bc6c24a8cc42df2614cd4e7f9a88c807e (diff) | |
omap dss hdmi uplevel include paths to 3.0
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-hdmi.c | 5 | ||||
| -rw-r--r-- | sound/soc/omap/omap4-hdmi-card.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/sdp4430.c | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index 36c6eaeffb0..88ebbbc8ba6 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -25,13 +25,16 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/display.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/initval.h> #include <sound/soc.h> +#include <video/omapdss.h> #include <plat/dma.h> +#include <plat/omap44xx.h> #include "omap-pcm.h" #include "omap-hdmi.h" @@ -110,7 +113,7 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev) } omap_hdmi_dai_dma_params.port_addr = hdmi_rsrc->start - + OMAP_HDMI_AUDIO_DMA_PORT; + + OMAP44XX_HDMI_AUDIO_DMA_PORT; hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!hdmi_rsrc) { diff --git a/sound/soc/omap/omap4-hdmi-card.c b/sound/soc/omap/omap4-hdmi-card.c index d92fdd84f6f..091811346d0 100644 --- a/sound/soc/omap/omap4-hdmi-card.c +++ b/sound/soc/omap/omap4-hdmi-card.c @@ -69,7 +69,7 @@ static struct snd_soc_dai_link omap4_hdmi_dai = { .cpu_dai_name = "hdmi-audio-dai", .platform_name = "omap-pcm-audio", .codec_name = "omapdss_hdmi", - .codec_dai_name = "hdmi-audio-codec", + .codec_dai_name = "omap4-hdmi-audio-codec", .ops = &omap4_hdmi_dai_ops, }; diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index 7435a64a96b..424ca3d512f 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -826,8 +826,9 @@ static struct snd_soc_dai_link sdp4430_dai[] = { .be_hw_params_fixup = dmic_be_hw_params_fixup, .be_id = OMAP_ABE_DAI_DMIC2, }, -======= +}; +#if 0 static struct snd_soc_dai_link sdp4430_dai = { .name = "TWL6040", .stream_name = "TWL6040", @@ -838,7 +839,7 @@ static struct snd_soc_dai_link sdp4430_dai = { .init = sdp4430_twl6040_init, .ops = &sdp4430_ops, }; - +#endif #if 0 static struct snd_soc_dai_link sdp4430_dai[] = { |