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

Commit 5fd7447a authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

omapdss: hdmi audio: Make header file independent of video/omapdss.h 



Clean up the header files regarding to hdmi audio so the omap-hdmi-audio.h
file will only need to include the platform_data/omapdss.h file.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
CC: Mark Brown <broonie@kernel.org>
CC: Jyri Sarha <jsarha@ti.com>
CC: Liam Girdwood <liam.r.girdwood@linux.intel.com>
parent f28316f2

drivers/gpu/drm/omapdrm/dss/hdmi.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/platform_device.h>

#include <linux/hdmi.h>

#include <video/omapdss.h>

#include <sound/omap-hdmi-audio.h>



#include "dss.h"

drivers/video/fbdev/omap2/omapfb/dss/hdmi.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/platform_device.h>

#include <linux/hdmi.h>

#include <video/omapdss.h>

#include <sound/omap-hdmi-audio.h>



#include "dss.h"

include/sound/omap-hdmi-audio.h

+7 −2
Original line number Diff line number Diff line
@@ -16,11 +16,16 @@ 
 *

 */



#include <video/omapdss.h>



#ifndef __OMAP_HDMI_AUDIO_H__

#define __OMAP_HDMI_AUDIO_H__



#include <linux/platform_data/omapdss.h>



struct omap_dss_audio {

	struct snd_aes_iec958 *iec;

	struct snd_cea_861_aud_if *cea;

};



struct omap_hdmi_audio_ops {

	int (*audio_startup)(struct device *dev,

			     void (*abort_cb)(struct device *dev));

include/video/omapdss.h

+0 −5
Original line number Diff line number Diff line
@@ -168,11 +168,6 @@ enum omap_dss_display_state { 
	OMAP_DSS_DISPLAY_ACTIVE,

};



struct omap_dss_audio {

	struct snd_aes_iec958 *iec;

	struct snd_cea_861_aud_if *cea;

};



enum omap_dss_rotation_type {

	OMAP_DSS_ROT_DMA	= 1 << 0,

	OMAP_DSS_ROT_VRFB	= 1 << 1,

sound/soc/omap/omap-hdmi-audio.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <sound/asoundef.h>

#include <sound/omap-pcm.h>

#include <sound/omap-hdmi-audio.h>

#include <video/omapdss.h>



#define DRV_NAME "omap-hdmi-audio"