From patchwork Fri Apr 23 02:29:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 50780 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5F8C3B7D1E for ; Fri, 23 Apr 2010 12:31:49 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O58gD-000893-A6; Fri, 23 Apr 2010 03:31:45 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O58gB-00088x-C1 for kernel-team@lists.ubuntu.com; Fri, 23 Apr 2010 03:31:43 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O58gB-0003fp-5r for ; Fri, 23 Apr 2010 03:31:43 +0100 Received: from [218.82.232.214] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1O58g9-00030n-LO for kernel-team@lists.ubuntu.com; Fri, 23 Apr 2010 03:31:43 +0100 From: Bryan Wu To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/5] ENGR00121069: MX51: Complete the constraints for the various regulators. Date: Fri, 23 Apr 2010 10:29:51 +0800 Message-Id: <1271989793-3770-4-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1271989793-3770-1-git-send-email-bryan.wu@canonical.com> References: <1271989793-3770-1-git-send-email-bryan.wu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Ranjani Vaidyanathan Completed intialization of mc13892 regulators. This was causing the regulator API to leave many regulators enabled at boot and also print error messages at boot. Signed-off-by: Ranjani Vaidyanathan Signed-off-by: Bryan Wu --- arch/arm/mach-mx51/mx51_babbage_pmic_mc13892.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-mx51/mx51_babbage_pmic_mc13892.c b/arch/arm/mach-mx51/mx51_babbage_pmic_mc13892.c index 558bb00..dbbdc64 100644 --- a/arch/arm/mach-mx51/mx51_babbage_pmic_mc13892.c +++ b/arch/arm/mach-mx51/mx51_babbage_pmic_mc13892.c @@ -99,11 +99,6 @@ static struct regulator_consumer_supply vdig_consumers[] = { .supply = "VDDA", .dev_name = "1-000a", }, - { - /* sgtl5000 */ - .supply = "VDDD", - .dev_name = "1-000a", - }, }; static struct regulator_consumer_supply vvideo_consumers[] = { @@ -215,6 +210,7 @@ static struct regulator_init_data vpll_init = { .max_uV = mV_to_uV(1800), .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, .boot_on = 1, + .always_on = 1, } }; @@ -225,6 +221,7 @@ static struct regulator_init_data vusb2_init = { .max_uV = mV_to_uV(2775), .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, .boot_on = 1, + .always_on = 1, } }; @@ -234,7 +231,6 @@ static struct regulator_init_data vvideo_init = { .min_uV = mV_to_uV(2775), .max_uV = mV_to_uV(2775), .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, - .always_on = 1, .apply_uV =1, }, .num_consumer_supplies = ARRAY_SIZE(vvideo_consumers), @@ -285,6 +281,7 @@ static struct regulator_init_data vgen2_init = { .min_uV = mV_to_uV(1200), .max_uV = mV_to_uV(3150), .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, + .always_on = 1, } }; @@ -294,6 +291,7 @@ static struct regulator_init_data vgen3_init = { .min_uV = mV_to_uV(1800), .max_uV = mV_to_uV(2900), .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, + .always_on = 1, } }; @@ -387,6 +385,8 @@ static int mc13892_regulator_init(struct mc13892 *mc13892) mc13892_register_regulator(mc13892, MC13892_GPO3, &gpo3_init); mc13892_register_regulator(mc13892, MC13892_GPO4, &gpo4_init); + regulator_has_full_constraints(); + return 0; }