From patchwork Tue Apr 19 09:22:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 717531 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3J9N18k020145 for ; Tue, 19 Apr 2011 09:23:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754464Ab1DSJXA (ORCPT ); Tue, 19 Apr 2011 05:23:00 -0400 Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:52092 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754436Ab1DSJW7 (ORCPT ); Tue, 19 Apr 2011 05:22:59 -0400 Received: from mail-ew0-f42.google.com ([209.85.215.42]) (using TLSv1) by na3sys009aob113.postini.com ([74.125.148.12]) with SMTP ID DSNKTa1UcoLheo0Eoa7s2aOjYi9lS7ncBKEf@postini.com; Tue, 19 Apr 2011 02:22:59 PDT Received: by mail-ew0-f42.google.com with SMTP id 2so1618432ewy.29 for ; Tue, 19 Apr 2011 02:22:58 -0700 (PDT) Received: by 10.213.97.27 with SMTP id j27mr2559746ebn.97.1303204978064; Tue, 19 Apr 2011 02:22:58 -0700 (PDT) Received: from deskari (a62-248-131-233.elisa-laajakaista.fi [62.248.131.233]) by mx.google.com with ESMTPS id m55sm4672311eei.8.2011.04.19.02.22.56 (version=SSLv3 cipher=OTHER); Tue, 19 Apr 2011 02:22:57 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 13/19] OMAP: DSS2: DSI: ensure VDDS_DSI is disabled on exit Date: Tue, 19 Apr 2011 12:22:16 +0300 Message-Id: <1303204942-25450-14-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1303204942-25450-1-git-send-email-tomi.valkeinen@ti.com> References: <1303204942-25450-1-git-send-email-tomi.valkeinen@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 09:23:04 +0000 (UTC) The panel drivers can leave the VDDS_DSI regulator enabled, even when the panel is disabled, to ensure that the DSI pins are powered. This patch ensures that VDDS_DSI is disabled on DSI module unload. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dsi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index f1e14ca..9c5715a 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -4090,6 +4090,11 @@ err1: static void dsi_exit(void) { if (dsi.vdds_dsi_reg != NULL) { + if (dsi.vdds_dsi_enabled) { + regulator_disable(dsi.vdds_dsi_reg); + dsi.vdds_dsi_enabled = false; + } + regulator_put(dsi.vdds_dsi_reg); dsi.vdds_dsi_reg = NULL; }