From 8c1450e41dc72f93831c5bc5cc81db829fe0e3e4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 24 Mar 2011 15:00:06 +0200 Subject: [PATCH] --- yaml --- r: 251048 b: refs/heads/master c: bb5476c7203c3c4798381d81b27feb97af69a9d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/displays/panel-taal.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5b27fc647fcc..8348e4d1c78d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f8fa452afe88b33cbfac6a82b0edd77a0644804 +refs/heads/master: bb5476c7203c3c4798381d81b27feb97af69a9d4 diff --git a/trunk/drivers/video/omap2/displays/panel-taal.c b/trunk/drivers/video/omap2/displays/panel-taal.c index 3f766035f885..e725a8d125b4 100644 --- a/trunk/drivers/video/omap2/displays/panel-taal.c +++ b/trunk/drivers/video/omap2/displays/panel-taal.c @@ -1018,6 +1018,15 @@ static void taal_power_off(struct omap_dss_device *dssdev) td->enabled = 0; } +static int taal_panel_reset(struct omap_dss_device *dssdev) +{ + dev_err(&dssdev->dev, "performing LCD reset\n"); + + taal_power_off(dssdev); + taal_hw_reset(dssdev); + return taal_power_on(dssdev); +} + static int taal_enable(struct omap_dss_device *dssdev) { struct taal_data *td = dev_get_drvdata(&dssdev->dev); @@ -1582,9 +1591,7 @@ static void taal_esd_work(struct work_struct *work) err: dev_err(&dssdev->dev, "performing LCD reset\n"); - taal_power_off(dssdev); - taal_hw_reset(dssdev); - taal_power_on(dssdev); + taal_panel_reset(dssdev); dsi_bus_unlock();