Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758616AbZKYKOg (ORCPT ); Wed, 25 Nov 2009 05:14:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758581AbZKYKOf (ORCPT ); Wed, 25 Nov 2009 05:14:35 -0500 Received: from smtp.nokia.com ([192.100.122.230]:22573 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758551AbZKYKOe (ORCPT ); Wed, 25 Nov 2009 05:14:34 -0500 From: Juha Keski-Saari To: lrg@slimlogic.co.uk, broonie@opensource.wolfsonmicro.com, dbrownell@users.sourceforge.net, sameo@linux.intel.com, linux-kernel@vger.kernel.org Cc: peter.de-schrijver@nokia.com, eduardo.valentin@nokia.com, ext-juha.1.keski-saari@nokia.com Subject: [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver Date: Wed, 25 Nov 2009 12:14:02 +0200 Message-Id: <1259144042-9662-2-git-send-email-ext-juha.1.keski-saari@nokia.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1259144042-9662-1-git-send-email-ext-juha.1.keski-saari@nokia.com> References: <1259144042-9662-1-git-send-email-ext-juha.1.keski-saari@nokia.com> X-OriginalArrivalTime: 25 Nov 2009 10:14:06.0610 (UTC) FILETIME=[056FBF20:01CA6DB8] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2775 Lines: 85 Add all twl4030 regulators to the twl4030 mfd driver and twl4030_platform_data Signed-off-by: Juha Keski-Saari Acked-by: Mark Brown Acked-by: Samuel Ortiz --- drivers/mfd/twl4030-core.c | 26 ++++++++++++++++++++++++-- include/linux/i2c/twl4030.h | 8 ++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index 0ee81e4..2d659e6 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -572,11 +572,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) } if (twl_has_regulator()) { - /* child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); if (IS_ERR(child)) return PTR_ERR(child); - */ + + child = add_regulator(TWL4030_REG_VIO, pdata->vio); + if (IS_ERR(child)) + return PTR_ERR(child); + + child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1); + if (IS_ERR(child)) + return PTR_ERR(child); + + child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2); + if (IS_ERR(child)) + return PTR_ERR(child); child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1); if (IS_ERR(child)) @@ -592,6 +602,18 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) pdata->vaux2); if (IS_ERR(child)) return PTR_ERR(child); + + child = add_regulator(TWL4030_REG_VINTANA1, pdata->vintana1); + if (IS_ERR(child)) + return PTR_ERR(child); + + child = add_regulator(TWL4030_REG_VINTANA2, pdata->vintana2); + if (IS_ERR(child)) + return PTR_ERR(child); + + child = add_regulator(TWL4030_REG_VINTDIG, pdata->vintdig); + if (IS_ERR(child)) + return PTR_ERR(child); } if (twl_has_regulator() && usb_transceiver) { diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index c188961..bf143d8 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h @@ -440,8 +440,12 @@ struct twl4030_platform_data { struct regulator_init_data *vaux2; struct regulator_init_data *vaux3; struct regulator_init_data *vaux4; - - /* REVISIT more to come ... _nothing_ should be hard-wired */ + struct regulator_init_data *vio; + struct regulator_init_data *vdd1; + struct regulator_init_data *vdd2; + struct regulator_init_data *vintana1; + struct regulator_init_data *vintana2; + struct regulator_init_data *vintdig; }; /*----------------------------------------------------------------------*/ -- 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/