From patchwork Mon Aug 22 08:26:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1084522 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.4) with ESMTP id p7M8R6ho020149 for ; Mon, 22 Aug 2011 08:27:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755027Ab1HVI1C (ORCPT ); Mon, 22 Aug 2011 04:27:02 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:57196 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754735Ab1HVI1A (ORCPT ); Mon, 22 Aug 2011 04:27:00 -0400 Received: from mail-bw0-f51.google.com ([209.85.214.51]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTlIS0mEZUDFAVK28K4rNqY8XBk/8u1np@postini.com; Mon, 22 Aug 2011 01:27:00 PDT Received: by mail-bw0-f51.google.com with SMTP id r19so3598741bka.38 for ; Mon, 22 Aug 2011 01:26:58 -0700 (PDT) Received: by 10.204.0.75 with SMTP id 11mr690722bka.397.1314001618434; Mon, 22 Aug 2011 01:26:58 -0700 (PDT) Received: from localhost.localdomain (a62-248-128-208.elisa-laajakaista.fi [62.248.128.208]) by mx.google.com with ESMTPS id v1sm969910bkd.55.2011.08.22.01.26.56 (version=SSLv3 cipher=OTHER); Mon, 22 Aug 2011 01:26:57 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: archit@ti.com, Tomi Valkeinen Subject: [PATCH 2/4] OMAP4: TWL: Add common omapdss supplies Date: Mon, 22 Aug 2011 11:26:37 +0300 Message-Id: <1314001599-17951-3-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314001599-17951-1-git-send-email-tomi.valkeinen@ti.com> References: <1314001599-17951-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]); Mon, 22 Aug 2011 08:27:07 +0000 (UTC) OMAP DSS normally gets power from VCXIO on OMAP4. Add configuration for this into twl-common.c Mark VCXIO as always_on, as VCXIO is used by multiple components, including the MPU, and turning it off when DSS doesn't need it would lead the device to halt. Signed-off-by: Tomi Valkeinen --- arch/arm/mach-omap2/twl-common.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 4f6d216..52243577 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c @@ -235,6 +235,12 @@ static struct regulator_init_data omap4_vana_idata = { }, }; +static struct regulator_consumer_supply omap4_vcxio_supply[] = { + REGULATOR_SUPPLY("vdds_dsi", "omapdss_dss"), + REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"), + REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.1"), +}; + static struct regulator_init_data omap4_vcxio_idata = { .constraints = { .min_uV = 1800000, @@ -243,7 +249,10 @@ static struct regulator_init_data omap4_vcxio_idata = { | REGULATOR_MODE_STANDBY, .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, + .always_on = true, }, + .num_consumer_supplies = ARRAY_SIZE(omap4_vcxio_supply), + .consumer_supplies = omap4_vcxio_supply, }; static struct regulator_init_data omap4_vusb_idata = {