public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: linux-omap@vger.kernel.org
Cc: sameo@linux.intel.com, broonie@opensource.wolfsonmicro.com,
	lrg@ti.com, khilman@ti.com, b-cousson@ti.com, rnayak@ti.com,
	gg@slimlogic.co.uk
Subject: [PATCHv7 5/7] mfd: twl-core: pass driver data from pdata to add_regulator for VDD1 and VDD2
Date: Mon, 28 Nov 2011 16:53:23 +0200	[thread overview]
Message-ID: <1322492005-27741-6-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1322492005-27741-1-git-send-email-t-kristo@ti.com>

This way, we can add custom flags for VDD1 and VDD2 regulators that
get passed all the way to regulator init. This is needed for SMPS
regulator support to select used controller mode for these regulators
(either voltage processor or default.)

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
 drivers/mfd/twl-core.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 01ecfee..af93fce 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -846,12 +846,14 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
 			return PTR_ERR(child);
 
 		child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1,
-					features);
+					features |
+					(u32)pdata->vdd1->driver_data);
 		if (IS_ERR(child))
 			return PTR_ERR(child);
 
 		child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2,
-					features);
+					features |
+					(u32)pdata->vdd2->driver_data);
 		if (IS_ERR(child))
 			return PTR_ERR(child);
 
-- 
1.7.4.1


  parent reply	other threads:[~2011-11-28 14:54 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-28 14:53 [PATCHv7 0/7] External controller support for TWLxxxx Tero Kristo
2011-11-28 14:53 ` [PATCHv7 1/7] regulator: twl: fix twl4030 support for smps regulators Tero Kristo
2011-11-28 18:58   ` Mark Brown
2011-11-28 14:53 ` [PATCHv7 2/7] TEMP: OMAP3: beagle rev-c4: enable OPP6 Tero Kristo
2011-11-28 14:53 ` [PATCHv7 3/7] omap3: voltage: fix channel configuration Tero Kristo
2011-12-02 23:55   ` Kevin Hilman
2011-12-05  9:35     ` Tero Kristo
2011-12-05 20:23       ` Kevin Hilman
2011-12-07  8:57         ` Tero Kristo
2011-12-10  1:05           ` Kevin Hilman
2011-11-28 14:53 ` [PATCHv7 4/7] omap3: add common twl configurations for vdd1 and vdd2 Tero Kristo
2011-12-02 23:56   ` Kevin Hilman
2011-11-28 14:53 ` Tero Kristo [this message]
2011-12-12 18:04   ` [PATCHv7 5/7] mfd: twl-core: pass driver data from pdata to add_regulator for VDD1 and VDD2 Samuel Ortiz
2011-12-13  7:19     ` Tero Kristo
2011-11-28 14:53 ` [PATCHv7 6/7] regulator: twl: add support for external controller Tero Kristo
2011-11-28 14:58   ` Mark Brown
2011-11-28 15:43     ` Tero Kristo
2011-11-28 15:56       ` Mark Brown
2011-11-28 14:53 ` [PATCHv7 7/7] omap3: twl-common: enable VP SMPS mode for VDD1 and VDD2 Tero Kristo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322492005-27741-6-git-send-email-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=b-cousson@ti.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=gg@slimlogic.co.uk \
    --cc=khilman@ti.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=rnayak@ti.com \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox