From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lb3-smtp-cloud2.xs4all.net ([194.109.24.29]:46145 "EHLO lb3-smtp-cloud2.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752265AbdDNKZ0 (ORCPT ); Fri, 14 Apr 2017 06:25:26 -0400 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Tomi Valkeinen , dri-devel@lists.freedesktop.org, Hans Verkuil Subject: [PATCH 3/8] omapdrm: hdmi.h: extend hdmi_core_data with CEC fields Date: Fri, 14 Apr 2017 12:25:07 +0200 Message-Id: <20170414102512.48834-4-hverkuil@xs4all.nl> In-Reply-To: <20170414102512.48834-1-hverkuil@xs4all.nl> References: <20170414102512.48834-1-hverkuil@xs4all.nl> Sender: linux-media-owner@vger.kernel.org List-ID: From: Hans Verkuil 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 --- 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 #include #include +#include #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; -- 2.11.0