All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <ext-jani.1.nikula@nokia.com>
To: Tomi.Valkeinen@nokia.com, tony@atomide.com
Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
	ext-jani.1.nikula@nokia.com
Subject: [PATCH v2 17/21] OMAP: DSS2: Taal: Configure ESD check in DSI panel data
Date: Mon, 03 May 2010 06:18:37 +0000	[thread overview]
Message-ID: <261f7b2c8cf1120e05d9664137e22ed237657c60.1272621452.git.ext-jani.1.nikula@nokia.com> (raw)
In-Reply-To: <d76f00a4c763b84d7511a9f0c98eb7117e9e6a3e.1272621452.git.ext-jani.1.nikula@nokia.com>

From: Jani Nikula <ext-jani.1.nikula@nokia.com>

Make ESD check usage configurable in DSI panel data, as opposed to a

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
---
 drivers/video/omap2/displays/panel-taal.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index b68976b..f5a1422 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -62,7 +62,6 @@
 #define DCS_GET_ID2		0xdb
 #define DCS_GET_ID3		0xdc
 
-/* #define TAAL_USE_ESD_CHECK */
 #define TAAL_ESD_CHECK_PERIOD	msecs_to_jiffies(5000)
 
 static irqreturn_t taal_te_isr(int irq, void *data);
@@ -794,6 +793,7 @@ static void taal_power_off(struct omap_dss_device *dssdev)
 static int taal_enable(struct omap_dss_device *dssdev)
 {
 	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+	struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev);
 	int r;
 
 	dev_dbg(&dssdev->dev, "enable\n");
@@ -814,9 +814,9 @@ static int taal_enable(struct omap_dss_device *dssdev)
 	if (r)
 		goto err;
 
-#ifdef TAAL_USE_ESD_CHECK
-	queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
-#endif
+	if (panel_data->use_esd_check)
+		queue_delayed_work(td->esd_wq, &td->esd_work,
+				TAAL_ESD_CHECK_PERIOD);
 
 	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
@@ -886,6 +886,7 @@ err:
 static int taal_resume(struct omap_dss_device *dssdev)
 {
 	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+	struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev);
 	int r;
 
 	dev_dbg(&dssdev->dev, "resume\n");
@@ -907,10 +908,9 @@ static int taal_resume(struct omap_dss_device *dssdev)
 		dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 	} else {
 		dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-#ifdef TAAL_USE_ESD_CHECK
-		queue_delayed_work(td->esd_wq, &td->esd_work,
-				TAAL_ESD_CHECK_PERIOD);
-#endif
+		if (panel_data->use_esd_check)
+			queue_delayed_work(td->esd_wq, &td->esd_work,
+					TAAL_ESD_CHECK_PERIOD);
 	}
 
 	mutex_unlock(&td->lock);
-- 
1.6.5.2


WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <ext-jani.1.nikula@nokia.com>
To: Tomi.Valkeinen@nokia.com, tony@atomide.com
Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
	ext-jani.1.nikula@nokia.com
Subject: [PATCH v2 17/21] OMAP: DSS2: Taal: Configure ESD check in DSI panel data
Date: Mon,  3 May 2010 09:18:37 +0300	[thread overview]
Message-ID: <261f7b2c8cf1120e05d9664137e22ed237657c60.1272621452.git.ext-jani.1.nikula@nokia.com> (raw)
In-Reply-To: <d76f00a4c763b84d7511a9f0c98eb7117e9e6a3e.1272621452.git.ext-jani.1.nikula@nokia.com>
In-Reply-To: <cover.1272621452.git.ext-jani.1.nikula@nokia.com>

From: Jani Nikula <ext-jani.1.nikula@nokia.com>

Make ESD check usage configurable in DSI panel data, as opposed to a

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
---
 drivers/video/omap2/displays/panel-taal.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index b68976b..f5a1422 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -62,7 +62,6 @@
 #define DCS_GET_ID2		0xdb
 #define DCS_GET_ID3		0xdc
 
-/* #define TAAL_USE_ESD_CHECK */
 #define TAAL_ESD_CHECK_PERIOD	msecs_to_jiffies(5000)
 
 static irqreturn_t taal_te_isr(int irq, void *data);
@@ -794,6 +793,7 @@ static void taal_power_off(struct omap_dss_device *dssdev)
 static int taal_enable(struct omap_dss_device *dssdev)
 {
 	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+	struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev);
 	int r;
 
 	dev_dbg(&dssdev->dev, "enable\n");
@@ -814,9 +814,9 @@ static int taal_enable(struct omap_dss_device *dssdev)
 	if (r)
 		goto err;
 
-#ifdef TAAL_USE_ESD_CHECK
-	queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
-#endif
+	if (panel_data->use_esd_check)
+		queue_delayed_work(td->esd_wq, &td->esd_work,
+				TAAL_ESD_CHECK_PERIOD);
 
 	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
@@ -886,6 +886,7 @@ err:
 static int taal_resume(struct omap_dss_device *dssdev)
 {
 	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+	struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev);
 	int r;
 
 	dev_dbg(&dssdev->dev, "resume\n");
@@ -907,10 +908,9 @@ static int taal_resume(struct omap_dss_device *dssdev)
 		dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 	} else {
 		dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-#ifdef TAAL_USE_ESD_CHECK
-		queue_delayed_work(td->esd_wq, &td->esd_work,
-				TAAL_ESD_CHECK_PERIOD);
-#endif
+		if (panel_data->use_esd_check)
+			queue_delayed_work(td->esd_wq, &td->esd_work,
+					TAAL_ESD_CHECK_PERIOD);
 	}
 
 	mutex_unlock(&td->lock);
-- 
1.6.5.2


  reply	other threads:[~2010-05-03  6:18 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-03  6:18 [PATCH v2 00/21] OMAP: DSS2: Taal panel driver updates Jani Nikula
2010-05-03  6:18 ` Jani Nikula
2010-05-03  6:18 ` [PATCH v2 01/21] OMAP: DSS2: Taal: Add panel hardware reset Jani Nikula
2010-05-03  6:18   ` Jani Nikula
2010-05-03  6:18   ` [PATCH v2 02/21] OMAP: DSS2: Taal: add locks to taal_bl_update_status Jani Nikula
2010-05-03  6:18     ` Jani Nikula
2010-05-03  6:18     ` [PATCH v2 03/21] OMAP: DSS2: Taal: Add locks to protect taal data access Jani Nikula
2010-05-03  6:18       ` Jani Nikula
2010-05-03  6:18       ` [PATCH v2 04/21] OMAP: DSS2: Taal: Cosmetic improvement to backlight properties initialization Jani Nikula
2010-05-03  6:18         ` Jani Nikula
2010-05-03  6:18         ` [PATCH v2 05/21] OMAP: DSS2: Taal: Remove platform enable/disable Jani Nikula
2010-05-03  6:18           ` Jani Nikula
2010-05-03  6:18           ` [PATCH v2 06/21] OMAP: DSS2: Taal: Fix request_irq() error handling Jani Nikula
2010-05-03  6:18             ` Jani Nikula
2010-05-03  6:18             ` [PATCH v2 07/21] OMAP: DSS2: Taal: Remove ESD work cancel from driver probe " Jani Nikula
2010-05-03  6:18               ` Jani Nikula
2010-05-03  6:18               ` [PATCH v2 08/21] OMAP: DSS2: Taal: Improve taal_power_on() " Jani Nikula
2010-05-03  6:18                 ` Jani Nikula
2010-05-03  6:18                 ` [PATCH v2 09/21] OMAP: DSS2: Taal: Bail out from taal_run_test() if panel is not enabled Jani Nikula
2010-05-03  6:18                   ` Jani Nikula
2010-05-03  6:18                   ` [PATCH v2 10/21] OMAP: DSS2: Taal: Change DSI bus locking to avoid deadlock in ESD work Jani Nikula
2010-05-03  6:18                     ` Jani Nikula
2010-05-03  6:18                     ` [PATCH v2 11/21] OMAP: DSS2: Taal: Check taal_power_on() return value in taal_resume() Jani Nikula
2010-05-03  6:18                       ` Jani Nikula
2010-05-03  6:18                       ` [PATCH v2 12/21] OMAP: DSS2: Taal: Change ESD work management Jani Nikula
2010-05-03  6:18                         ` Jani Nikula
2010-05-03  6:18                         ` [PATCH v2 13/21] OMAP: DSS2: Taal: Change probe error handling labels Jani Nikula
2010-05-03  6:18                           ` Jani Nikula
2010-05-03  6:18                           ` [PATCH v2 14/21] OMAP: DSS2: Taal: Add proper external TE support Jani Nikula
2010-05-03  6:18                             ` Jani Nikula
2010-05-03  6:18                             ` [PATCH v2 15/21] OMAP: DSS2: Add Nokia DSI command mode panel configuration struct Jani Nikula
2010-05-03  6:18                               ` Jani Nikula
2010-05-03  6:18                               ` [PATCH v2 16/21] OMAP: DSS2: Taal: Use Nokia DSI panel data Jani Nikula
2010-05-03  6:18                                 ` Jani Nikula
2010-05-03  6:18                                 ` Jani Nikula [this message]
2010-05-03  6:18                                   ` [PATCH v2 17/21] OMAP: DSS2: Taal: Configure ESD check in " Jani Nikula
2010-05-03  6:18                                   ` [PATCH v2 18/21] OMAP: DSS2: Taal: Add panel specific configuration structure Jani Nikula
2010-05-03  6:18                                     ` Jani Nikula
2010-05-03  6:18                                     ` [PATCH v2 19/21] OMAP: DSS2: Taal: Print panel name in addition to revision Jani Nikula
2010-05-03  6:18                                       ` Jani Nikula
2010-05-03  6:18                                       ` [PATCH v2 20/21] OMAP: DSS2: Taal: Add regulator configuration support Jani Nikula
2010-05-03  6:18                                         ` Jani Nikula
2010-05-03  6:18                                         ` [PATCH v2 21/21] OMAP: DSS2: Taal: CABC workaround is Taal specific Jani Nikula
2010-05-03  6:18                                           ` Jani Nikula

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=261f7b2c8cf1120e05d9664137e22ed237657c60.1272621452.git.ext-jani.1.nikula@nokia.com \
    --to=ext-jani.1.nikula@nokia.com \
    --cc=Tomi.Valkeinen@nokia.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --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 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.