ASoC: OMAP: HDMI: Update the platform device names

In order to utilize the new OMAP HDMI codec and the updated name of
the device of the CPU DAI, update the names at the drivers accordingly.

While there, also update the name of the machine driver to be more
generic and encompass more OMAP processors featuring HDMI and not
only OMAP4.

Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>

diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 38e0defa7078a9cf57f4d9c8fd7c2a6c3336fdd0..0925a46f9f4ee39184e46d20b4dda6cc6e80fb99 100644 (file)
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -35,7 +35,7 @@
 #include "omap-pcm.h"
 #include "omap-hdmi.h"
 
-#define DRV_NAME "hdmi-audio-dai"
+#define DRV_NAME "omap-hdmi-audio-dai"
 
 static struct omap_pcm_dma_data omap_hdmi_dai_dma_params = {
        .name = "HDMI playback",

diff --git a/sound/soc/omap/omap4-hdmi-card.c b/sound/soc/omap/omap4-hdmi-card.c
index 28d689b2714db4e009190fa8af3b1c31481659b8..99e96c6221a8d7a6e14cf715626431ed32372465 100644 (file)
--- a/sound/soc/omap/omap4-hdmi-card.c
+++ b/sound/soc/omap/omap4-hdmi-card.c
@@ -27,7 +27,7 @@
 #include <asm/mach-types.h>
 #include <video/omapdss.h>
 
-#define DRV_NAME "omap4-hdmi-audio"
+#define DRV_NAME "omap-hdmi-audio"
 
 static int omap4_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
                struct snd_pcm_hw_params *params)
@@ -65,10 +65,10 @@ static struct snd_soc_ops omap4_hdmi_dai_ops = {
 static struct snd_soc_dai_link omap4_hdmi_dai = {
        .name = "HDMI",
        .stream_name = "HDMI",
-       .cpu_dai_name = "hdmi-audio-dai",
+       .cpu_dai_name = "omap-hdmi-audio-dai",
        .platform_name = "omap-pcm-audio",
-       .codec_name = "omapdss_hdmi",
-       .codec_dai_name = "hdmi-audio-codec",
+       .codec_name = "hdmi-audio-codec",
+       .codec_dai_name = "omap-hdmi-hifi",
        .ops = &omap4_hdmi_dai_ops,
 };
 
@@ -106,7 +106,7 @@ static int __devexit omap4_hdmi_remove(struct platform_device *pdev)
 
 static struct platform_driver omap4_hdmi_driver = {
        .driver = {
-               .name = "omap4-hdmi-audio",
+               .name = DRV_NAME,
                .owner = THIS_MODULE,
        },
        .probe = omap4_hdmi_probe,