Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2017-08-11 16:49:04 +03:00 committed by Tomi Valkeinen
parent fe16bc5132
commit d20fa5a06d
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -667,7 +667,7 @@ static int hdmi_audio_register(struct device *dev)
{ {
struct omap_hdmi_audio_pdata pdata = { struct omap_hdmi_audio_pdata pdata = {
.dev = dev, .dev = dev,
.dss_version = omapdss_get_version(), .version = 4,
.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp), .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
.ops = &hdmi_audio_ops, .ops = &hdmi_audio_ops,
}; };

2
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File

@ -694,7 +694,7 @@ static int hdmi_audio_register(struct device *dev)
{ {
struct omap_hdmi_audio_pdata pdata = { struct omap_hdmi_audio_pdata pdata = {
.dev = dev, .dev = dev,
.dss_version = omapdss_get_version(), .version = 5,
.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp), .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
.ops = &hdmi_audio_ops, .ops = &hdmi_audio_ops,
}; };

2
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
View File

@ -664,7 +664,7 @@ static int hdmi_audio_register(struct device *dev)
{ {
struct omap_hdmi_audio_pdata pdata = { struct omap_hdmi_audio_pdata pdata = {
.dev = dev, .dev = dev,
.dss_version = omapdss_get_version(), .version = 4,
.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp), .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
.ops = &hdmi_audio_ops, .ops = &hdmi_audio_ops,
}; };

2
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
View File

@ -695,7 +695,7 @@ static int hdmi_audio_register(struct device *dev)
{ {
struct omap_hdmi_audio_pdata pdata = { struct omap_hdmi_audio_pdata pdata = {
.dev = dev, .dev = dev,
.dss_version = omapdss_get_version(), .version = 5,
.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp), .audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
.ops = &hdmi_audio_ops, .ops = &hdmi_audio_ops,
}; };

2
include/sound/omap-hdmi-audio.h
View File

@ -39,7 +39,7 @@ struct omap_hdmi_audio_ops {
/* HDMI audio initalization data */ /* HDMI audio initalization data */
struct omap_hdmi_audio_pdata { struct omap_hdmi_audio_pdata {
struct device *dev; struct device *dev;
enum omapdss_version dss_version; unsigned int version;
phys_addr_t audio_dma_addr; phys_addr_t audio_dma_addr;
const struct omap_hdmi_audio_ops *ops; const struct omap_hdmi_audio_ops *ops;

9
sound/soc/omap/omap-hdmi-audio.c
View File

@ -337,14 +337,11 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
ad->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ad->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
mutex_init(&ad->current_stream_lock); mutex_init(&ad->current_stream_lock);
switch (ha->dss_version) { switch (ha->version) {
case OMAPDSS_VER_OMAP4430_ES1: case 4:
case OMAPDSS_VER_OMAP4430_ES2:
case OMAPDSS_VER_OMAP4:
dai_drv = &omap4_hdmi_dai; dai_drv = &omap4_hdmi_dai;
break; break;
case OMAPDSS_VER_OMAP5: case 5:
case OMAPDSS_VER_DRA7xx:
dai_drv = &omap5_hdmi_dai; dai_drv = &omap5_hdmi_dai;
break; break;
default: default: