drm: omapdrm: hdmi: Pass HDMI core version as integer to HDMI audio

The HDMI audio driver only needs to know which generation of HDMI
transmitter it deals with, not the detailed SoC model. Pass the version
number as an integer to prepare for removal of the OMAP SoC version from
the omapdrm driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 438f47d..4c131d7 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -667,7 +667,7 @@ static int hdmi_audio_register(struct device *dev)
 {
        struct omap_hdmi_audio_pdata pdata = {
                .dev = dev,
-               .dss_version = omapdss_get_version(),
+               .version = 4,
                .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
                .ops = &hdmi_audio_ops,
        };

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 8ab76b5..a6addde 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -694,7 +694,7 @@ static int hdmi_audio_register(struct device *dev)
 {
        struct omap_hdmi_audio_pdata pdata = {
                .dev = dev,
-               .dss_version = omapdss_get_version(),
+               .version = 5,
                .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
                .ops = &hdmi_audio_ops,
        };

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
index 156a254..ec78d61 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@ -664,7 +664,7 @@ static int hdmi_audio_register(struct device *dev)
 {
        struct omap_hdmi_audio_pdata pdata = {
                .dev = dev,
-               .dss_version = omapdss_get_version(),
+               .version = 4,
                .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
                .ops = &hdmi_audio_ops,
        };

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
index 4da36bc..2e2fcc3 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@@ -695,7 +695,7 @@ static int hdmi_audio_register(struct device *dev)
 {
        struct omap_hdmi_audio_pdata pdata = {
                .dev = dev,
-               .dss_version = omapdss_get_version(),
+               .version = 5,
                .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
                .ops = &hdmi_audio_ops,
        };

diff --git a/include/sound/omap-hdmi-audio.h b/include/sound/omap-hdmi-audio.h
index 1df2ff6..0e495ed 100644 (file)
--- a/include/sound/omap-hdmi-audio.h
+++ b/include/sound/omap-hdmi-audio.h
@@ -39,7 +39,7 @@ struct omap_hdmi_audio_ops {
 /* HDMI audio initalization data */
 struct omap_hdmi_audio_pdata {
        struct device *dev;
-       enum omapdss_version dss_version;
+       unsigned int version;
        phys_addr_t audio_dma_addr;
 
        const struct omap_hdmi_audio_ops *ops;

diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 888133f..3e9cc48 100644 (file)
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -337,14 +337,11 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
        ad->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
        mutex_init(&ad->current_stream_lock);
 
-       switch (ha->dss_version) {
-       case OMAPDSS_VER_OMAP4430_ES1:
-       case OMAPDSS_VER_OMAP4430_ES2:
-       case OMAPDSS_VER_OMAP4:
+       switch (ha->version) {
+       case 4:
                dai_drv = &omap4_hdmi_dai;
                break;
-       case OMAPDSS_VER_OMAP5:
-       case OMAPDSS_VER_DRA7xx:
+       case 5:
                dai_drv = &omap5_hdmi_dai;
                break;
        default: