Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d20fa5a0 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fe16bc51

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};

drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};

drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};

include/sound/omap-hdmi-audio.h

+1 −1
Original line number Diff line number Diff line
@@ -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;