Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964834AbZKYNi4 (ORCPT ); Wed, 25 Nov 2009 08:38:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934546AbZKYNiz (ORCPT ); Wed, 25 Nov 2009 08:38:55 -0500 Received: from smtp.nokia.com ([192.100.122.230]:39120 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934547AbZKYNiy (ORCPT ); Wed, 25 Nov 2009 08:38:54 -0500 Subject: Re: [PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info From: Juha Keski-Saari To: "lrg@slimlogic.co.uk" Cc: "broonie@opensource.wolfsonmicro.com" , "dbrownell@users.sourceforge.net" , "linux-kernel@vger.kernel.org" , "De-Schrijver Peter (Nokia-D/Helsinki)" , "Valentin Eduardo (Nokia-D/Helsinki)" In-Reply-To: <1259143495-9480-2-git-send-email-ext-juha.1.keski-saari@nokia.com> References: <1259143495-9480-1-git-send-email-ext-juha.1.keski-saari@nokia.com> <1259143495-9480-2-git-send-email-ext-juha.1.keski-saari@nokia.com> Content-Type: text/plain; charset="UTF-8" Date: Wed, 25 Nov 2009 15:38:10 +0200 Message-ID: <1259156290.6303.2.camel@keskisaa-workstation> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 25 Nov 2009 13:38:15.0245 (UTC) FILETIME=[8A311FD0:01CA6DD4] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2620 Lines: 77 Regrettably it seems I slipped a mistake into this patch which took out the regulators VAUX1-3. Below is a version which removes this issue >From 9ddec9979471fa7ba77532fa50c88137051d2037 Mon Sep 17 00:00:00 2001 From: Juha Keski-Saari Date: Wed, 25 Nov 2009 10:58:46 +0200 Subject: [PATCHv3 1/3] twl4030-regulator: Add all TWL regulators to twreg_info Define all twl4030 regulators in the twlreg_info table, along with appropriate VSEL tables for adjustable regulators Signed-off-by: Juha Keski-Saari Acked-by: Mark Brown Acked-by: Samuel Ortiz --- drivers/regulator/twl4030-regulator.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c index 9365140..c50b8b7 100644 --- a/drivers/regulator/twl4030-regulator.c +++ b/drivers/regulator/twl4030-regulator.c @@ -260,7 +260,18 @@ static const u16 VSIM_VSEL_table[] = { static const u16 VDAC_VSEL_table[] = { 1200, 1300, 1800, 1800, }; - +static const u16 VDD1_VSEL_table[] = { + 800, 1450, +}; +static const u16 VDD2_VSEL_table[] = { + 800, 1450, 1500, +}; +static const u16 VIO_VSEL_table[] = { + 1800, 1850, +}; +static const u16 VINTANA2_VSEL_table[] = { + 2500, 2750, +}; static int twl4030ldo_list_voltage(struct regulator_dev *rdev, unsigned index) { @@ -397,20 +408,16 @@ static struct twlreg_info twl4030_regs[] = { TWL_ADJUSTABLE_LDO(VAUX4, 0x23, 4), TWL_ADJUSTABLE_LDO(VMMC1, 0x27, 5), TWL_ADJUSTABLE_LDO(VMMC2, 0x2b, 6), - /* TWL_ADJUSTABLE_LDO(VPLL1, 0x2f, 7), - */ TWL_ADJUSTABLE_LDO(VPLL2, 0x33, 8), TWL_ADJUSTABLE_LDO(VSIM, 0x37, 9), TWL_ADJUSTABLE_LDO(VDAC, 0x3b, 10), - /* - TWL_ADJUSTABLE_LDO(VINTANA1, 0x3f, 11), + TWL_FIXED_LDO(VINTANA1, 0x3f, 1500, 11), TWL_ADJUSTABLE_LDO(VINTANA2, 0x43, 12), - TWL_ADJUSTABLE_LDO(VINTDIG, 0x47, 13), - TWL_SMPS(VIO, 0x4b, 14), - TWL_SMPS(VDD1, 0x55, 15), - TWL_SMPS(VDD2, 0x63, 16), - */ + TWL_FIXED_LDO(VINTDIG, 0x47, 1500, 13), + TWL_ADJUSTABLE_LDO(VIO, 0x4b, 14), + TWL_ADJUSTABLE_LDO(VDD1, 0x55, 15), + TWL_ADJUSTABLE_LDO(VDD2, 0x63, 16), TWL_FIXED_LDO(VUSB1V5, 0x71, 1500, 17), TWL_FIXED_LDO(VUSB1V8, 0x74, 1800, 18), TWL_FIXED_LDO(VUSB3V1, 0x77, 3100, 19), -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/