Mailing List Archive: Linux: Kernel

[PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info

Index | Next | Previous | View Threaded

ext-juha.1.keski-saari at nokia

Nov 25, 2009, 2:04 AM

Post #1 of 6 (194 views)
Permalink

[PATCHv2 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 <ext-juha.1.keski-saari [at] nokia>
Acked-by: Mark Brown <broonie [at] opensource>
Acked-by: Samuel Ortiz <sameo [at] linux>
---
drivers/regulator/twl4030-regulator.c | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index 9365140..75da6af 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)
{
@@ -390,27 +401,19 @@ static struct regulator_ops twl4030fixed_ops = {
* software control over them after boot.
*/
static struct twlreg_info twl4030_regs[] = {
- TWL_ADJUSTABLE_LDO(VAUX1, 0x17, 1),
- TWL_ADJUSTABLE_LDO(VAUX2_4030, 0x1b, 2),
- TWL_ADJUSTABLE_LDO(VAUX2, 0x1b, 2),
- TWL_ADJUSTABLE_LDO(VAUX3, 0x1f, 3),
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 [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

ext-juha.1.keski-saari at nokia

Nov 25, 2009, 5:38 AM

Post #2 of 6 (179 views)
Permalink

Re: [PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info [In reply to]

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 <ext-juha.1.keski-saari [at] nokia>
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 <ext-juha.1.keski-saari [at] nokia>
Acked-by: Mark Brown <broonie [at] opensource>
Acked-by: Samuel Ortiz <sameo [at] linux>
---
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 [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

lrg at slimlogic

Nov 25, 2009, 5:49 AM

Post #3 of 6 (179 views)
Permalink

Re: [PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info [In reply to]

On Wed, 2009-11-25 at 15:38 +0200, Juha Keski-Saari wrote:
> 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
>

Ah, I've just applied and pushed this series. Can you redo against
voltage for-next ?

Thanks

Liam

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

ext-juha.1.keski-saari at nokia

Nov 25, 2009, 6:22 AM

Post #4 of 6 (176 views)
Permalink

Re: [PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info [In reply to]

On Wed, 2009-11-25 at 14:49 +0100, ext Liam Girdwood wrote:
> On Wed, 2009-11-25 at 15:38 +0200, Juha Keski-Saari wrote:
> > 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
> >
>
> Ah, I've just applied and pushed this series. Can you redo against
> voltage for-next ?
>
> Thanks
>
> Liam

Here are the additions done on recent voltage-2.6/for-next, my apologies
for the extra work

>From 03578bd4f927f7777557be6d473eb0011b80608a Mon Sep 17 00:00:00 2001
From: Juha Keski-Saari <ext-juha.1.keski-saari [at] nokia>
Date: Wed, 25 Nov 2009 16:18:35 +0200
Subject: [PATCH] twl4030-regulator: Fixes VAUX1-3 exclusion introduced
in 3277b9fce0fcaa68d5947429e062163852ebc6fb

Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari [at] nokia>
---
drivers/regulator/twl4030-regulator.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/twl4030-regulator.c
b/drivers/regulator/twl4030-regulator.c
index 02100bc..477c965 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -401,6 +401,10 @@ static struct regulator_ops twl4030fixed_ops = {
* software control over them after boot.
*/
static struct twlreg_info twl4030_regs[] = {
+ TWL_ADJUSTABLE_LDO(VAUX1, 0x17, 1),
+ TWL_ADJUSTABLE_LDO(VAUX2_4030, 0x1b, 2),
+ TWL_ADJUSTABLE_LDO(VAUX2, 0x1b, 2),
+ TWL_ADJUSTABLE_LDO(VAUX3, 0x1f, 3),
TWL_ADJUSTABLE_LDO(VAUX4, 0x23, 4),
TWL_ADJUSTABLE_LDO(VMMC1, 0x27, 5),
TWL_ADJUSTABLE_LDO(VMMC2, 0x2b, 6),
--
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

broonie at opensource

Nov 25, 2009, 6:33 AM

Post #5 of 6 (180 views)
Permalink

Re: [PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info [In reply to]

On Wed, Nov 25, 2009 at 04:22:43PM +0200, Juha Keski-Saari wrote:

> Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari [at] nokia>

all these are Acked-by: Mark Brown <broonie [at] opensource>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

lrg at slimlogic

Nov 25, 2009, 10:19 AM

Post #6 of 6 (175 views)
Permalink

Re: [PATCHv2 1/3] twl4030-regulator: Add all TWL regulators to twreg_info [In reply to]

On Wed, 2009-11-25 at 16:22 +0200, Juha Keski-Saari wrote:
> On Wed, 2009-11-25 at 14:49 +0100, ext Liam Girdwood wrote:
> > On Wed, 2009-11-25 at 15:38 +0200, Juha Keski-Saari wrote:
> > > 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
> > >
> >
> > Ah, I've just applied and pushed this series. Can you redo against
> > voltage for-next ?
> >
> > Thanks
> >
> > Liam
>
> Here are the additions done on recent voltage-2.6/for-next, my apologies
> for the extra work
>
> >From 03578bd4f927f7777557be6d473eb0011b80608a Mon Sep 17 00:00:00 2001
> From: Juha Keski-Saari <ext-juha.1.keski-saari [at] nokia>
> Date: Wed, 25 Nov 2009 16:18:35 +0200
> Subject: [PATCH] twl4030-regulator: Fixes VAUX1-3 exclusion introduced
> in 3277b9fce0fcaa68d5947429e062163852ebc6fb
>
> Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari [at] nokia>
> ---
> drivers/regulator/twl4030-regulator.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>

Applied.

Thanks

Liam

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads