From ab550bbdf077252df4b69853a3cdec1968fdc03c Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Wed, 21 Nov 2012 12:08:40 +0530 Subject: [PATCH] --- yaml --- r: 371340 b: refs/heads/master c: 64f938974ee39686b017ebe4b6087aa55e2f0a82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/displays/panel-n8x0.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 57ab24293b19..9b4cfce96a13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3fb8b98bbb896132dc123aa460caf9d53372636 +refs/heads/master: 64f938974ee39686b017ebe4b6087aa55e2f0a82 diff --git a/trunk/drivers/video/omap2/displays/panel-n8x0.c b/trunk/drivers/video/omap2/displays/panel-n8x0.c index 9c55c9152863..c146a3d215e2 100644 --- a/trunk/drivers/video/omap2/displays/panel-n8x0.c +++ b/trunk/drivers/video/omap2/displays/panel-n8x0.c @@ -426,6 +426,7 @@ static int n8x0_panel_probe(struct omap_dss_device *dssdev) { struct panel_n8x0_data *bdata = get_board_data(dssdev); struct panel_drv_data *ddata; + int r; dev_dbg(&dssdev->dev, "probe\n"); @@ -444,6 +445,20 @@ static int n8x0_panel_probe(struct omap_dss_device *dssdev) dssdev->ctrl.rfbi_timings = n8x0_panel_timings; dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE; + if (gpio_is_valid(bdata->panel_reset)) { + r = devm_gpio_request_one(&dssdev->dev, bdata->panel_reset, + GPIOF_OUT_INIT_LOW, "PANEL RESET"); + if (r) + return r; + } + + if (gpio_is_valid(bdata->ctrl_pwrdown)) { + r = devm_gpio_request_one(&dssdev->dev, bdata->ctrl_pwrdown, + GPIOF_OUT_INIT_LOW, "PANEL PWRDOWN"); + if (r) + return r; + } + return 0; }