All of lore.kernel.org
 help / color / mirror / Atom feed
From: <mythripk@ti.com>
To: tomi.valkeinen@ti.com, linux-omap@vger.kernel.org
Cc: Mythri P K <mythripk@ti.com>
Subject: [PATCH v2 09/10] MAP4: DSS: HDMI: Rename the functions in HDMI IP
Date: Mon, 29 Aug 2011 11:44:59 +0530	[thread overview]
Message-ID: <1314598500-24005-10-git-send-email-mythripk@ti.com> (raw)
In-Reply-To: <1314598500-24005-9-git-send-email-mythripk@ti.com>

From: Mythri P K <mythripk@ti.com>

Functions that are included in the generic video include of HDMI TI OMAP4, TI8xx
etc IP library is renamed to have IP specific names so that it will not conflict
with similar function from other IP.

Signed-off-by: Mythri P K <mythripk@ti.com>
---
 drivers/video/omap2/dss/dss_features.c    |   14 +++++++-------
 drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c |   15 ++++++++-------
 include/video/omaphdmi.h                  |   15 ++++++++-------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index edf2929..c1ef0d6 100644
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -434,13 +434,13 @@ const struct omap_hdmi_ip_driver *omap_hdmi_functions;
 /* HDMI OMAP4 Functions*/
 const struct omap_hdmi_ip_driver omap4_hdmi_functions = {
 
-	.video_configure	=	hdmi_basic_configure,
-	.phy_enable		=	hdmi_phy_enable,
-	.phy_disable		=	hdmi_phy_disable,
-	.read_edid		=	read_edid,
-	.pll_enable		=	hdmi_pll_enable,
-	.pll_disable		=	hdmi_pll_disable,
-	.video_enable		=	hdmi_wp_video_start,
+	.video_configure	=	hdmi_ti_4xxx_basic_configure,
+	.phy_enable		=	hdmi_ti_4xxx_phy_enable,
+	.phy_disable		=	hdmi_ti_4xxx_phy_disable,
+	.read_edid		=	hdmi_ti_4xxx_read_edid,
+	.pll_enable		=	hdmi_ti_4xxx_pll_enable,
+	.pll_disable		=	hdmi_ti_4xxx_pll_disable,
+	.video_enable		=	hdmi_ti_4xxx_wp_video_start,
 };
 
 void dss_hdmi_features_init(struct hdmi_ip_data *ip_data)
diff --git a/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c b/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c
index f64e06c..3ce99b0 100644
--- a/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c
+++ b/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c
@@ -194,7 +194,7 @@ static int hdmi_pll_reset(struct hdmi_ip_data *ip_data)
 	return 0;
 }
 
-int hdmi_pll_enable(struct hdmi_ip_data *ip_data)
+int hdmi_ti_4xxx_pll_enable(struct hdmi_ip_data *ip_data)
 {
 	u16 r = 0;
 	enum hdmi_clk_refsel refsel;
@@ -220,12 +220,12 @@ int hdmi_pll_enable(struct hdmi_ip_data *ip_data)
 	return 0;
 }
 
-void hdmi_pll_disable(struct hdmi_ip_data *ip_data)
+void hdmi_ti_4xxx_pll_disable(struct hdmi_ip_data *ip_data)
 {
 	hdmi_set_pll_pwr(ip_data, HDMI_PLLPWRCMD_ALLOFF);
 }
 
-int hdmi_phy_enable(struct hdmi_ip_data *ip_data)
+int hdmi_ti_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
 {
 	u16 r = 0;
 	void __iomem *phy_base = hdmi_phy_base(ip_data);
@@ -262,7 +262,7 @@ int hdmi_phy_enable(struct hdmi_ip_data *ip_data)
 	return 0;
 }
 
-void hdmi_phy_disable(struct hdmi_ip_data *ip_data)
+void hdmi_ti_4xxx_phy_disable(struct hdmi_ip_data *ip_data)
 {
 	hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
 }
@@ -368,7 +368,8 @@ static int hdmi_core_ddc_edid(struct hdmi_ip_data *ip_data,
 	return 0;
 }
 
-int read_edid(struct hdmi_ip_data *ip_data, u8 *pedid, u16 max_length)
+int hdmi_ti_4xxx_read_edid(struct hdmi_ip_data *ip_data,
+				u8 *pedid, u16 max_length)
 {
 	int r = 0, n = 0, i = 0;
 	int max_ext_blocks = (max_length / 128) - 1;
@@ -621,7 +622,7 @@ static void hdmi_wp_init(struct omap_video_timings *timings,
 
 }
 
-void hdmi_wp_video_start(struct hdmi_ip_data *ip_data, bool start)
+void hdmi_ti_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start)
 {
 	REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_CFG, start, 31, 31);
 }
@@ -688,7 +689,7 @@ static void hdmi_wp_video_config_timing(struct hdmi_ip_data *ip_data,
 	hdmi_write_reg(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_TIMING_V, timing_v);
 }
 
-void hdmi_basic_configure(struct hdmi_ip_data *ip_data)
+void hdmi_ti_4xxx_basic_configure(struct hdmi_ip_data *ip_data)
 {
 	/* HDMI */
 	struct omap_video_timings video_timing;
diff --git a/include/video/omaphdmi.h b/include/video/omaphdmi.h
index a740237..9548284 100644
--- a/include/video/omaphdmi.h
+++ b/include/video/omaphdmi.h
@@ -84,11 +84,12 @@ struct hdmi_ip_data {
 	struct hdmi_config cfg;
 	struct hdmi_pll_info pll_data;
 };
-int hdmi_phy_enable(struct hdmi_ip_data *ip_data);
-void hdmi_phy_disable(struct hdmi_ip_data *ip_data);
-int read_edid(struct hdmi_ip_data *ip_data, u8 *pedid, u16 max_length);
-void hdmi_wp_video_start(struct hdmi_ip_data *ip_data, bool start);
-int hdmi_pll_enable(struct hdmi_ip_data *ip_data);
-void hdmi_pll_disable(struct hdmi_ip_data *ip_data);
-void hdmi_basic_configure(struct hdmi_ip_data *ip_data);
+int hdmi_ti_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
+void hdmi_ti_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
+int hdmi_ti_4xxx_read_edid(struct hdmi_ip_data *ip_data,
+					u8 *pedid, u16 max_length);
+void hdmi_ti_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start);
+int hdmi_ti_4xxx_pll_enable(struct hdmi_ip_data *ip_data);
+void hdmi_ti_4xxx_pll_disable(struct hdmi_ip_data *ip_data);
+void hdmi_ti_4xxx_basic_configure(struct hdmi_ip_data *ip_data);
 #endif
-- 
1.7.5.4


  reply	other threads:[~2011-08-29  6:23 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-29  6:14 [PATCH v2 00/10]HDMI: Split hdmi.c in DSS to seperate OMAP dependent mythripk
2011-08-29  6:14 ` [PATCH v2 01/10] OMAP4: DSS: HDMI: HDMI clean up to pass base_address mythripk
2011-08-29  6:14   ` [PATCH v2 02/10] OMAP4: DSS: HDMI: Move pll and video configuration mythripk
2011-08-29  6:14     ` [PATCH v2 03/10] OMAP4: DSS: HDMI: Use specific HDMI timings structure mythripk
2011-08-29  6:14       ` [PATCH v2 04/10] OMAP4: DSS: HDMI: Move the common header file mythripk
2011-08-29  6:14         ` [PATCH v2 05/10] OMAP4 : DSS : HDMI : Move the EDID portion from HDMI mythripk
2011-08-29  6:14           ` [PATCH v2 06/10] OMAP4: DSS2: HDMI: Split the HDMI driver to DSS and IP mythripk
2011-08-29  6:14             ` [PATCH v2 07/10] OMAP4: DSS2: HDMI: Provide a wrapper API to configure mythripk
2011-08-29  6:14               ` [PATCH v2 08/10] OMAP4: DSS2: HDMI: Function pointer approach to call mythripk
2011-08-29  6:14                 ` mythripk [this message]
2011-08-29  6:15                   ` [PATCH v2 10/10] OMAP4: DSS: Rename hdmi_omap4_panel.c to hdmi_panel.c mythripk
2011-09-01  8:55                 ` [PATCH v2 08/10] OMAP4: DSS2: HDMI: Function pointer approach to call Tomi Valkeinen
2011-09-01  8:38               ` [PATCH v2 07/10] OMAP4: DSS2: HDMI: Provide a wrapper API to configure Tomi Valkeinen
2011-09-01  9:00         ` [PATCH v2 04/10] OMAP4: DSS: HDMI: Move the common header file Tomi Valkeinen
2011-09-02  5:15           ` K, Mythri P
2011-09-02  5:24             ` Tomi Valkeinen
2011-09-02  5:27               ` K, Mythri P
2011-09-01  8:14       ` [PATCH v2 03/10] OMAP4: DSS: HDMI: Use specific HDMI timings structure Tomi Valkeinen
2011-09-02  5:09         ` K, Mythri P
2011-09-01  8:27     ` [PATCH v2 02/10] OMAP4: DSS: HDMI: Move pll and video configuration Tomi Valkeinen
2011-09-02  5:11       ` K, Mythri P
2011-09-02  5:13         ` Tomi Valkeinen
2011-09-02  5:22           ` K, Mythri P

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=1314598500-24005-10-git-send-email-mythripk@ti.com \
    --to=mythripk@ti.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=tomi.valkeinen@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.