From patchwork Tue Feb 28 09:39:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 6970 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AB73B24942 for ; Tue, 28 Feb 2012 09:39:30 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6F663A187EF for ; Tue, 28 Feb 2012 09:39:30 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so953403iag.11 for ; Tue, 28 Feb 2012 01:39:30 -0800 (PST) Received: from mr.google.com ([10.50.95.230]) by 10.50.95.230 with SMTP id dn6mr1433614igb.0.1330421970285 (num_hops = 1); Tue, 28 Feb 2012 01:39:30 -0800 (PST) Received: by 10.50.95.230 with SMTP id dn6mr1170078igb.0.1330421970235; Tue, 28 Feb 2012 01:39:30 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp4277ibr; Tue, 28 Feb 2012 01:39:29 -0800 (PST) Received: by 10.236.185.197 with SMTP id u45mr20865270yhm.6.1330421969438; Tue, 28 Feb 2012 01:39:29 -0800 (PST) Received: from comal.ext.ti.com (comal.ext.ti.com. [198.47.26.152]) by mx.google.com with ESMTPS id t5si19034924yht.28.2012.02.28.01.39.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 01:39:29 -0800 (PST) Received-SPF: pass (google.com: domain of rnayak@ti.com designates 198.47.26.152 as permitted sender) client-ip=198.47.26.152; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rnayak@ti.com designates 198.47.26.152 as permitted sender) smtp.mail=rnayak@ti.com Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id q1S9dQPQ002487; Tue, 28 Feb 2012 03:39:27 -0600 Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q1S9dQcD011518; Tue, 28 Feb 2012 15:09:26 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Tue, 28 Feb 2012 15:09:26 +0530 Received: from ula0131687.apr.dhcp.ti.com (ula0131687-172024136088.apr.dhcp.ti.com [172.24.136.88]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id q1S9dEGa004711; Tue, 28 Feb 2012 15:09:23 +0530 (IST) From: Rajendra Nayak To: , CC: , , , , , , , Peter Ujfalusi , Rajendra Nayak , Samuel Ortiz , Misael Lopez Cruz , Santosh Shilimkar Subject: [PATCH 4/4] MFD: twl-core: regulator configuration for twl6030 V1V8, V2V1 SMPS Date: Tue, 28 Feb 2012 15:09:13 +0530 Message-ID: <1330421953-29517-5-git-send-email-rnayak@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1330421953-29517-1-git-send-email-rnayak@ti.com> References: <1330421953-29517-1-git-send-email-rnayak@ti.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkJWwn4qvKmZoHwEfPSBrF7jO9Kma8zOuK1UCKVV8BHL/aHdKzhu4PZaJtI89GvtaMh4W1Q From: Peter Ujfalusi To be able to attach consumers to these supplies from board files we need to have regulator_init_data for them. Signed-off-by: Peter Ujfalusi Signed-off-by: Rajendra Nayak Cc: Samuel Ortiz Cc: Misael Lopez Cruz Cc: Santosh Shilimkar --- drivers/mfd/twl-core.c | 10 ++++++++++ include/linux/i2c/twl.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index e1d3a64..6cb1061 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -966,6 +966,16 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) if (IS_ERR(child)) return PTR_ERR(child); + child = add_regulator(TWL6030_REG_V1V8, pdata->v1v8, + features); + if (IS_ERR(child)) + return PTR_ERR(child); + + child = add_regulator(TWL6030_REG_V2V1, pdata->v2v1, + features); + if (IS_ERR(child)) + return PTR_ERR(child); + child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc, features); if (IS_ERR(child)) diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index f66c031..7fcab23 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -734,6 +734,8 @@ struct twl4030_platform_data { struct regulator_init_data *vcxio; struct regulator_init_data *vusb; struct regulator_init_data *clk32kg; + struct regulator_init_data *v1v8; + struct regulator_init_data *v2v1; /* TWL6025 LDO regulators */ struct regulator_init_data *ldo1; struct regulator_init_data *ldo2;