From patchwork Sat May 17 18:21:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Reid X-Patchwork-Id: 4196981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DD987BEEAC for ; Sat, 17 May 2014 18:26:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B707A20260 for ; Sat, 17 May 2014 18:26:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64EBE2015E for ; Sat, 17 May 2014 18:26:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WljFF-0003TP-ME; Sat, 17 May 2014 18:22:05 +0000 Received: from mail-qc0-f201.google.com ([209.85.216.201]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WljF4-0003Rl-14 for linux-arm-kernel@lists.infradead.org; Sat, 17 May 2014 18:21:58 +0000 Received: by mail-qc0-f201.google.com with SMTP id l6so666970qcy.4 for ; Sat, 17 May 2014 11:21:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tII/3NVHb4rsPARAgBB0K8vrjgfARqL6ABDlY1mOxHM=; b=L4bu/qcEqZGI7MG6rF+DgE+R9uF7eIyyJGdVenJoVgK1S7LS310LHr6dgO4+w49i7m ZauHlcV8OJL4wxMQsgRQaHAzHLRKxmg991msC47AXAHU5eJ7lktPnjc5NG9GVPcOKX+O jqs40Y5paqOFENIvei2mZpx5DfQrZTmuMP8mZc/yFlmy/Wva20thwfTbCAMzGFGQVFTS NcNz/8kOXrryyudYq/Pju9hEhIcWngTix9prFOHCNxj6vnEtrjYk7b901BYwHyWw8KUB 5Bic2Bq1zRyEsibjlAOcWvxtJavgVA0Qg/TZYGXN/kAtqSOhKyOa/22s9USqXVms9EJu FanQ== X-Gm-Message-State: ALoCoQkQwwQDwH3ZoMfSqWs1rzyrVVRbu+jhJRDJT2xX74YtLwtfsA0rZ9o/k4G242WfUV+G53qk X-Received: by 10.58.234.164 with SMTP id uf4mr1860384vec.13.1400350891701; Sat, 17 May 2014 11:21:31 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id c50si600235yhl.7.2014.05.17.11.21.31 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 May 2014 11:21:31 -0700 (PDT) Received: from hojo20.mtv.corp.google.com (hojo20.mtv.corp.google.com [172.22.72.28]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 8B99D31C1D0; Sat, 17 May 2014 11:21:31 -0700 (PDT) Received: by hojo20.mtv.corp.google.com (Postfix, from userid 123195) id 4DCB6180726; Sat, 17 May 2014 11:21:31 -0700 (PDT) From: Dylan Reid To: linux-tegra@vger.kernel.org Subject: [PATCH 2/2] drm/tegra: Enable HDMI_5V_CON regulator Date: Sat, 17 May 2014 11:21:21 -0700 Message-Id: <1400350881-22008-2-git-send-email-dgreid@chromium.org> X-Mailer: git-send-email 1.8.1.3.605.g02339dd In-Reply-To: <1400350881-22008-1-git-send-email-dgreid@chromium.org> References: <1400350881-22008-1-git-send-email-dgreid@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140517_112154_139709_1EB5DCD0 X-CRM114-Status: GOOD ( 11.17 ) X-Spam-Score: -1.4 (-) Cc: Dylan Reid , thierry.reding@gmail.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, swarren@wwwdotorg.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The DDC bus uses this for it's supply, enable it so EDID can be read. This eliminates I2C read timeouts on Venice2 and EDID can be verified with i2cdump. Signed-off-by: Dylan Reid --- drivers/gpu/drm/tegra/hdmi.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 6928015..3d3cd7e 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -44,6 +44,7 @@ struct tegra_hdmi { struct regulator *vdd; struct regulator *pll; + struct regulator *hdmi_5v; void __iomem *regs; unsigned int irq; @@ -1263,6 +1264,13 @@ static int tegra_hdmi_init(struct host1x_client *client) return err; } + err = regulator_enable(hdmi->hdmi_5v); + if (err < 0) { + dev_err(client->dev, "failed to enable HDMI 5V regulator: %d\n", + err); + return err; + } + hdmi->output.type = TEGRA_OUTPUT_HDMI; hdmi->output.dev = client->dev; hdmi->output.ops = &hdmi_ops; @@ -1307,6 +1315,7 @@ static int tegra_hdmi_exit(struct host1x_client *client) } regulator_disable(hdmi->vdd); + regulator_disable(hdmi->hdmi_5v); return 0; } @@ -1411,6 +1420,12 @@ static int tegra_hdmi_probe(struct platform_device *pdev) return PTR_ERR(hdmi->pll); } + hdmi->hdmi_5v = devm_regulator_get(&pdev->dev, "hdmi"); + if (IS_ERR(hdmi->hdmi_5v)) { + dev_err(&pdev->dev, "failed to get HDMI 5V regulator\n"); + return PTR_ERR(hdmi->hdmi_5v); + } + hdmi->output.dev = &pdev->dev; err = tegra_output_probe(&hdmi->output);