From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <tomi.valkeinen@ti.com>, <plagnioj@jcrosoft.com>,
<robdclark@gmail.com>, <airlied@linux.ie>, <tony@atomide.com>
Cc: <linux-fbdev@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<laurent.pinchart@ideasonboard.com>, <jsarha@ti.com>,
<dri-devel@lists.freedesktop.org>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>
Subject: [PATCH 21/26] omapdss: hdmi audio: Make header file independent of video/omapdss.h
Date: Mon, 30 May 2016 14:42:53 +0300 [thread overview]
Message-ID: <20160530114258.30879-22-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160530114258.30879-1-peter.ujfalusi@ti.com>
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>
---
drivers/gpu/drm/omapdrm/dss/hdmi.h | 1 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 1 +
include/sound/omap-hdmi-audio.h | 9 +++++++--
include/video/omapdss.h | 5 -----
sound/soc/omap/omap-hdmi-audio.c | 1 -
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h
index 53616b02b613..c32a21a26054 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi.h
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h
@@ -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"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
index 53616b02b613..c32a21a26054 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
@@ -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"
diff --git a/include/sound/omap-hdmi-audio.h b/include/sound/omap-hdmi-audio.h
index afdb416898e0..1df2ff61a4dd 100644
--- a/include/sound/omap-hdmi-audio.h
+++ b/include/sound/omap-hdmi-audio.h
@@ -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));
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 53ada70cf23c..b25e2eab4b48 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -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,
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 64425d352962..888133f9e65d 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -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"
--
2.8.3
next prev parent reply other threads:[~2016-05-30 11:44 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-30 11:42 [PATCH 00/26] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 01/26] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi
2016-05-30 11:56 ` Belisko Marek
2016-05-30 12:35 ` Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 02/26] omapfb: panel-nec-nl8048hl11: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 03/26] omapfb: panel-tpo-td043mtea1: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 04/26] omapfb: panel-sharp-ls037v7dw01: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 05/26] omapfb: panel-lgphilips-lb035q02: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 06/26] omapfb: panel-dsi-cm: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 07/26] omapfb: connector-hdmi: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 08/26] omapfb: connector-dvi: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 09/26] omapfb: encoder-tfp410: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 10/26] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 11/26] drm/omap: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 12/26] omapfb: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 13/26] ARM: OMAP: rx51-video: Do not set TV connector_type Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 14/26] omapdss: omap-panel-data.h: Remove connector_type from atv pdata Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 15/26] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 16/26] drm/omap: Remove reference to pdata->default_device Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 17/26] omapfb: " Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 18/26] video: omapdss: Remove unused members from struct omap_dss_board_info Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 19/26] video/platform_data: omapdss: Create new header file for platform data Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 20/26] ARM: OMAP2: Use the platform_data header for omapdss Peter Ujfalusi
2016-05-30 11:42 ` Peter Ujfalusi [this message]
2016-05-30 11:42 ` [PATCH 22/26] drm/omap: Do not include video/omapdss.h directly in drivers Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 23/26] omapfb: Create new header file for omapfb DSS implementation Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 24/26] [media] omap_vout: Switch to use the video/omapfb_dss.h header file Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 25/26] omapfb: Copy video/omapdss.h content to video/omapfb_dss.h Peter Ujfalusi
2016-05-30 11:42 ` [PATCH 26/26] drm/omap: Remove the video/omapdss.h and move it's content to local header file Peter Ujfalusi
2016-05-30 14:26 ` [PATCH 00/26] fb/drm: omapdss: Clean up the headers and separate the two stack Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160530114258.30879-22-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=airlied@linux.ie \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jsarha@ti.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--cc=robdclark@gmail.com \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).