From: Hans Verkuil hans.verkuil@cisco.com
Extend the hdmi_core_data struct with the additional fields needed for CEC.
Also fix a simple typo in a comment.
Signed-off-by: Hans Verkuil hans.verkuil@cisco.com --- drivers/gpu/drm/omapdrm/dss/hdmi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h index fb6cccd02374..3913859146b9 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 <sound/omap-hdmi-audio.h> +#include <media/cec.h>
#include "omapdss.h" #include "dss.h" @@ -254,6 +255,9 @@ struct hdmi_phy_data {
struct hdmi_core_data { void __iomem *base; + 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, @@ -361,7 +365,7 @@ struct omap_hdmi { bool audio_configured; 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; bool audio_playing; bool display_enabled;