From patchwork Thu Aug 23 13:45:10 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tomi Valkeinen <tomi.valkeinen@ti.com>
X-Patchwork-Id: 1367211
Return-Path: <linux-omap-owner@vger.kernel.org>
X-Original-To: patchwork-linux-omap@patchwork.kernel.org
Delivered-To: patchwork-process-083081@patchwork2.kernel.org
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by patchwork2.kernel.org (Postfix) with ESMTP id 6503CDF2AB
	for <patchwork-linux-omap@patchwork.kernel.org>;
	Thu, 23 Aug 2012 13:45:43 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933870Ab2HWNpm (ORCPT
	<rfc822;patchwork-linux-omap@patchwork.kernel.org>);
	Thu, 23 Aug 2012 09:45:42 -0400
Received: from na3sys009aog120.obsmtp.com ([74.125.149.140]:55476 "EHLO
	na3sys009aog120.obsmtp.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S933047Ab2HWNpl (ORCPT
	<rfc822;linux-omap@vger.kernel.org>);
	Thu, 23 Aug 2012 09:45:41 -0400
Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1)
	by na3sys009aob120.postini.com ([74.125.148.12]) with SMTP
	ID DSNKUDY0A6HpjXMiFh3auFJMaHdw/4A98YcB@postini.com;
	Thu, 23 Aug 2012 06:45:40 PDT
Received: by lagu2 with SMTP id u2so419617lag.36
	for <linux-omap@vger.kernel.org>;
	Thu, 23 Aug 2012 06:45:38 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=google.com; s=20120113;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
	:x-gm-message-state;
	bh=dQJpbE85vgHiK4Gy5CXE1uukaw7llz9w+ZzjlO/hcKQ=;
	b=TKQjqzQhjG8wFb14Ra4ZOgRf/FF63oDCPfEab9byWm5k1l4du8dClGoDr1XBej6fTV
	z2wvIcWZ3uy28cxg7AmW6bEUlci4FXR2aL9JtQZz4V8pcS0kr0XEZBPkxMCYUR9Fxspl
	uaEIsLgL/eQMxi8k07KTeu45Nd+rvl/7jcEwnATc2rfRNAthq4ndBkKYlaWE+KVU7vFx
	dy9ZNIa25R3OXuW6yp3I++IqzR/lXZpudKq7eXXMPpYzEMbLtWmeebu29/d3GFJ/SALC
	gi24frHoXp6eXzdYovUM2Th7m2UqFWW7tIMKjbfEOF25+3gpcYEtSeZ7vF5ISFUC05QP
	tiSQ==
Received: by 10.112.28.7 with SMTP id x7mr937402lbg.54.1345729538434;
	Thu, 23 Aug 2012 06:45:38 -0700 (PDT)
Received: from localhost.localdomain (a91-156-160-115.elisa-laajakaista.fi.
	[91.156.160.115])
	by mx.google.com with ESMTPS id fz8sm466816lbb.9.2012.08.23.06.45.36
	(version=SSLv3 cipher=OTHER); Thu, 23 Aug 2012 06:45:37 -0700 (PDT)
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: archit@ti.com
Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
	Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH 4/8] OMAPDSS: HDMI: use vdda_hdmi_dac
Date: Thu, 23 Aug 2012 16:45:10 +0300
Message-Id: <1345729514-2441-5-git-send-email-tomi.valkeinen@ti.com>
X-Mailer: git-send-email 1.7.9.5
In-Reply-To: <1345729514-2441-1-git-send-email-tomi.valkeinen@ti.com>
References: <1345729514-2441-1-git-send-email-tomi.valkeinen@ti.com>
X-Gm-Message-State: 
 ALoCoQngV2xpm8pTl7rzwj0hsMvzffVcakAMocPhgfq43qN6/TZe5cOT1DP15vZNdPjNHk2NSvFB
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org

The HDMI driver requires vdda_hdmi_dac power for operation, but does not
enable it. This has worked because the regulator has been always
enabled.

But this may not always be the case, as I encountered when implementing
HDMI device tree support.

This patch changes the HDMI driver to use the vdda_hdmi_dac.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/video/omap2/dss/hdmi.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 96a6e29..ccfc677 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -33,6 +33,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
+#include <linux/regulator/consumer.h>
 #include <video/omapdss.h>
 
 #include "ti_hdmi.h"
@@ -62,6 +63,7 @@ static struct {
 	struct hdmi_ip_data ip_data;
 
 	struct clk *sys_clk;
+	struct regulator *vdda_hdmi_dac_reg;
 
 	int ct_cp_hpd_gpio;
 	int ls_oe_gpio;
@@ -331,6 +333,19 @@ static int __init hdmi_init_display(struct omap_dss_device *dssdev)
 
 	dss_init_hdmi_ip_ops(&hdmi.ip_data);
 
+	if (hdmi.vdda_hdmi_dac_reg == NULL) {
+		struct regulator *reg;
+
+		reg = devm_regulator_get(&hdmi.pdev->dev, "vdda_hdmi_dac");
+
+		if (IS_ERR(reg)) {
+			DSSERR("can't get VDDA_HDMI_DAC regulator\n");
+			return PTR_ERR(reg);
+		}
+
+		hdmi.vdda_hdmi_dac_reg = reg;
+	}
+
 	r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
 	if (r)
 		return r;
@@ -495,6 +510,10 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 	/* wait 300us after CT_CP_HPD for the 5V power output to reach 90% */
 	udelay(300);
 
+	r = regulator_enable(hdmi.vdda_hdmi_dac_reg);
+	if (r)
+		goto err_vdac_enable;
+
 	r = hdmi_runtime_get();
 	if (r)
 		goto err_runtime_get;
@@ -562,6 +581,8 @@ err_phy_enable:
 err_pll_enable:
 	hdmi_runtime_put();
 err_runtime_get:
+	regulator_disable(hdmi.vdda_hdmi_dac_reg);
+err_vdac_enable:
 	gpio_set_value(hdmi.ct_cp_hpd_gpio, 0);
 	gpio_set_value(hdmi.ls_oe_gpio, 0);
 	return -EIO;
@@ -576,6 +597,8 @@ static void hdmi_power_off(struct omap_dss_device *dssdev)
 	hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);
 	hdmi_runtime_put();
 
+	regulator_disable(hdmi.vdda_hdmi_dac_reg);
+
 	gpio_set_value(hdmi.ct_cp_hpd_gpio, 0);
 	gpio_set_value(hdmi.ls_oe_gpio, 0);
 }