Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Peter 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>

+9 -8
+1
drivers/gpu/drm/omapdrm/dss/hdmi.h
··· 24 24 #include <linux/platform_device.h> 25 25 #include <linux/hdmi.h> 26 26 #include <video/omapdss.h> 27 + #include <sound/omap-hdmi-audio.h> 27 28 28 29 #include "dss.h" 29 30
+1
drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
··· 24 24 #include <linux/platform_device.h> 25 25 #include <linux/hdmi.h> 26 26 #include <video/omapdss.h> 27 + #include <sound/omap-hdmi-audio.h> 27 28 28 29 #include "dss.h" 29 30
+7 -2
include/sound/omap-hdmi-audio.h
··· 16 16 * 17 17 */ 18 18 19 - #include <video/omapdss.h> 20 - 21 19 #ifndef __OMAP_HDMI_AUDIO_H__ 22 20 #define __OMAP_HDMI_AUDIO_H__ 21 + 22 + #include <linux/platform_data/omapdss.h> 23 + 24 + struct omap_dss_audio { 25 + struct snd_aes_iec958 *iec; 26 + struct snd_cea_861_aud_if *cea; 27 + }; 23 28 24 29 struct omap_hdmi_audio_ops { 25 30 int (*audio_startup)(struct device *dev,
-5
include/video/omapdss.h
··· 168 168 OMAP_DSS_DISPLAY_ACTIVE, 169 169 }; 170 170 171 - struct omap_dss_audio { 172 - struct snd_aes_iec958 *iec; 173 - struct snd_cea_861_aud_if *cea; 174 - }; 175 - 176 171 enum omap_dss_rotation_type { 177 172 OMAP_DSS_ROT_DMA = 1 << 0, 178 173 OMAP_DSS_ROT_VRFB = 1 << 1,
-1
sound/soc/omap/omap-hdmi-audio.c
··· 28 28 #include <sound/asoundef.h> 29 29 #include <sound/omap-pcm.h> 30 30 #include <sound/omap-hdmi-audio.h> 31 - #include <video/omapdss.h> 32 31 33 32 #define DRV_NAME "omap-hdmi-audio" 34 33