Commit eb2f17b4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Tomi Valkeinen

omapdrm: hdmi.h: extend hdmi_core_data with CEC fields

Extend the hdmi_core_data struct with the additional fields needed
for CEC.

Also fix a simple typo in a comment.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 3b86b9ec
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/hdmi.h> #include <linux/hdmi.h>
#include <sound/omap-hdmi-audio.h> #include <sound/omap-hdmi-audio.h>
#include <media/cec.h>
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
...@@ -264,6 +265,10 @@ struct hdmi_core_data { ...@@ -264,6 +265,10 @@ struct hdmi_core_data {
void __iomem *base; void __iomem *base;
bool cts_swmode; bool cts_swmode;
bool audio_use_mclk; bool audio_use_mclk;
struct hdmi_wp_data *wp;
unsigned int core_pwr_cnt;
struct cec_adapter *adap;
}; };
static inline void hdmi_write_reg(void __iomem *base_addr, const u32 idx, static inline void hdmi_write_reg(void __iomem *base_addr, const u32 idx,
...@@ -373,7 +378,7 @@ struct omap_hdmi { ...@@ -373,7 +378,7 @@ struct omap_hdmi {
bool audio_configured; bool audio_configured;
struct omap_dss_audio audio_config; struct omap_dss_audio audio_config;
/* This lock should be taken when booleans bellow are touched. */ /* This lock should be taken when booleans below are touched. */
spinlock_t audio_playing_lock; spinlock_t audio_playing_lock;
bool audio_playing; bool audio_playing;
bool display_enabled; bool display_enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment