From patchwork Thu Dec 10 13:11:47 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?=
 <uwe@kleine-koenig.org>
X-Patchwork-Id: 7818861
Return-Path: <linux-fbdev-owner@kernel.org>
X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.136])
	by patchwork1.web.kernel.org (Postfix) with ESMTP id 53ECC9F1C2
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Thu, 10 Dec 2015 13:17:33 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
	by mail.kernel.org (Postfix) with ESMTP id 3F539205C2
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Thu, 10 Dec 2015 13:17:31 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 47FAC205B5
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Thu, 10 Dec 2015 13:17:30 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751960AbbLJNRW (ORCPT
	<rfc822;patchwork-linux-fbdev@patchwork.kernel.org>);
	Thu, 10 Dec 2015 08:17:22 -0500
Received: from arcturus.kleine-koenig.org ([78.47.169.190]:60543 "EHLO
	arcturus.kleine-koenig.org" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751572AbbLJNRV (ORCPT
	<rfc822;linux-fbdev@vger.kernel.org>);
	Thu, 10 Dec 2015 08:17:21 -0500
Received: by arcturus.kleine-koenig.org (Postfix, from userid 1000)
	id 41FBA81EB3; Thu, 10 Dec 2015 14:12:10 +0100 (CET)
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <uwe@kleine-koenig.org>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: linux-omap@vger.kernel.org, kernel@pengutronix.de,
	linux-fbdev@vger.kernel.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?=
	<u.kleine-koenig@pengutronix.de>
Subject: [PATCH 5/5] fbdev: omap2: panel-dpi: allow specification of a vcc
	regulator
Date: Thu, 10 Dec 2015 14:11:47 +0100
Message-Id: <1449753107-11410-5-git-send-email-uwe@kleine-koenig.org>
X-Mailer: git-send-email 2.6.2
In-Reply-To: <1449753107-11410-1-git-send-email-uwe@kleine-koenig.org>
References: <1449753107-11410-1-git-send-email-uwe@kleine-koenig.org>
MIME-Version: 1.0
Sender: linux-fbdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-fbdev.vger.kernel.org>
X-Mailing-List: linux-fbdev@vger.kernel.org
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI,
	T_RP_MATCHES_RCVD,
	UNPARSEABLE_RELAY autolearn=ham version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

To allow supporting displays that need some logic to enable power to the
display add support for a vcc-supply property to drive a regulator.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 Documentation/devicetree/bindings/video/panel-dpi.txt |  1 +
 drivers/video/fbdev/omap2/displays-new/panel-dpi.c    | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Documentation/devicetree/bindings/video/panel-dpi.txt b/Documentation/devicetree/bindings/video/panel-dpi.txt
index 1a1d8f6f884f..eaa39d1b1279 100644
--- a/Documentation/devicetree/bindings/video/panel-dpi.txt
+++ b/Documentation/devicetree/bindings/video/panel-dpi.txt
@@ -8,6 +8,7 @@ Optional properties:
 - label: a symbolic name for the panel
 - enable-gpios: panel enable gpio
 - reset-gpios: GPIO to control the RESET pin
+- vcc-supply: phandle of regulator that will be used to enable power to the display
 
 Required nodes:
 - "panel-timing" containing video timings
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index 7e2f9e0813dc..65c6d9e6862b 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/regulator/consumer.h>
 
 #include <video/omapdss.h>
 #include <video/omap-panel-data.h>
@@ -33,6 +34,7 @@ struct panel_drv_data {
 
 	struct gpio_desc *enable_gpio;
 	struct gpio_desc *reset_gpio;
+	struct regulator *vcc_supply;
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -84,6 +86,12 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
 	if (r)
 		return r;
 
+	r = regulator_enable(ddata->vcc_supply);
+	if (r) {
+		in->ops.dpi->disable(in);
+		return r;
+	}
+
 	gpiod_set_value_cansleep(ddata->reset_gpio, 0);
 	gpiod_set_value_cansleep(ddata->enable_gpio, 1);
 
@@ -107,6 +115,7 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
 		gpio_set_value_cansleep(ddata->backlight_gpio, 0);
 
 	gpiod_set_value_cansleep(ddata->enable_gpio, 0);
+	regulator_disable(ddata->vcc_supply);
 
 	in->ops.dpi->disable(in);
 
@@ -218,6 +227,10 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
 	if (IS_ERR(ddata->reset_gpio))
 		return PTR_ERR(ddata->reset_gpio);
 
+	ddata->vcc_supply = devm_regulator_get(&pdev->dev, "vcc");
+	if (IS_ERR(ddata->vcc_supply))
+		return PTR_ERR(ddata->vcc_supply);
+
 	ddata->backlight_gpio = -ENOENT;
 
 	r = of_get_display_timing(node, "panel-timing", &timing);