mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Warren <swarren@nvidia.com>
To: <linux-kernel@vger.kernel.org>
Cc: <lrg@slimlogic.co.uk>, <broonie@opensource.wolfsonmicro.com>,
	<dahuang@nvidia.com>, <olofj@chromium.org>,
	Stephen Warren <swarren@nvidia.com>
Subject: [PATCH 4/4] regulator: tps6586x: correct register table
Date: Wed, 1 Dec 2010 13:37:31 -0700	[thread overview]
Message-ID: <1291235851-29523-5-git-send-email-swarren@nvidia.com> (raw)
In-Reply-To: <1291235851-29523-1-git-send-email-swarren@nvidia.com>

From: Danny Huang <dahuang@nvidia.com>

Correct the register table for SM2, LDO8, RTC

Change-Id: I45348cec5ffbb7da9bd7523764fb611b537236b8
Signed-off-by: Danny Huang <dahuang@nvidia.com>
Signed-off-by: Olof Johansson <olofj@chromium.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 drivers/regulator/tps6586x-regulator.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index c668944..6d20b04 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -274,11 +274,11 @@ static struct tps6586x_regulator tps6586x_regulator[] = {
 	TPS6586X_LDO(LDO_5, ldo, SUPPLYV6, 0, 3, ENE, 6, ENE, 6),
 	TPS6586X_LDO(LDO_6, ldo, SUPPLYV3, 0, 3, ENC, 4, END, 4),
 	TPS6586X_LDO(LDO_7, ldo, SUPPLYV3, 3, 3, ENC, 5, END, 5),
-	TPS6586X_LDO(LDO_8, ldo, SUPPLYV1, 5, 3, ENC, 6, END, 6),
+	TPS6586X_LDO(LDO_8, ldo, SUPPLYV2, 5, 3, ENC, 6, END, 6),
 	TPS6586X_LDO(LDO_9, ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7),
-	TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, ENE, 7, ENE, 7),
+	TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7),
 	TPS6586X_LDO(LDO_1, dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1),
-	TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 1, END, 1),
+	TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7),
 
 	TPS6586X_DVM(LDO_2, dvm, LDO2BV1, 0, 5, ENA, 3, ENB, 3, VCC2, 6),
 	TPS6586X_DVM(LDO_4, ldo4, LDO4V1, 0, 5, ENC, 3, END, 3, VCC1, 6),
-- 
1.7.0.4
nvpublic


  parent reply	other threads:[~2010-12-01 20:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-01 20:37 [PATCH 0/4] Various tps6586x regulator fixes from ChromeOS Stephen Warren
2010-12-01 20:37 ` [PATCH 1/4] regulator: tps6586x: Add missing bit mask generation Stephen Warren
2010-12-01 20:37 ` [PATCH 2/4] regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit Stephen Warren
2010-12-01 20:37 ` [PATCH 3/4] regulator: tps6586x: Handle both enable reg/bits being the same Stephen Warren
2010-12-01 20:37 ` Stephen Warren [this message]
2010-12-02  9:40 ` [PATCH 0/4] Various tps6586x regulator fixes from ChromeOS Mark Brown
2010-12-02 11:28   ` Liam Girdwood

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=1291235851-29523-5-git-send-email-swarren@nvidia.com \
    --to=swarren@nvidia.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=dahuang@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    --cc=olofj@chromium.org \
    /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

Powered by JetHome