* [PATCH v3] regulator: palmas: model SMPS10 as two regulators
@ 2013-07-01 9:49 Kishon Vijay Abraham I
2013-07-01 10:01 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2013-07-01 9:49 UTC (permalink / raw)
To: lgirdwood, broonie, ldewangan, gg, sameo, kishon, j-keerthy; +Cc: linux-kernel
SMPS10 has two outputs OUT1 and OUT2 and have one input IN1.
SMPS10-OUT2 is connected to SMPS10-IN1 and can be configured either
in BOOST mode or BYPASS mode. regulator_enable of SMPS10-OUT2 configures
it in BOOST mode. For BYPASS mode regulator_allow_bypass() API can be
used. SMPS10-OUT1 is connected to SMPS10-OUT2 and can be enabled using
regulator_enable().
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
Changes from v2;
Fixed the compilation error.
drivers/regulator/palmas-regulator.c: In function 'palmas_regulators_probe':
drivers/regulator/palmas-regulator.c:850:8: error: 'PALMAS_REG_SMPS10'
undeclared (first use in this function)
case PALMAS_REG_SMPS10:
^
Changes from v1:
Reversed the order of SMPS10_OUT2 and SMPS10_OUT1 since the input signal
of OUT1 is OUT2
drivers/regulator/palmas-regulator.c | 42 ++++++++++++++++++++++++++++++----
include/linux/mfd/palmas.h | 9 ++++----
2 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index d0c8785..a904d46 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -97,11 +97,16 @@ static const struct regs_info palmas_regs_info[] = {
.ctrl_addr = PALMAS_SMPS9_CTRL,
},
{
- .name = "SMPS10",
+ .name = "SMPS10_OUT2",
.sname = "smps10-in",
.ctrl_addr = PALMAS_SMPS10_CTRL,
},
{
+ .name = "SMPS10_OUT1",
+ .sname = "smps10-out2",
+ .ctrl_addr = PALMAS_SMPS10_CTRL,
+ },
+ {
.name = "LDO1",
.sname = "ldo1-in",
.vsel_addr = PALMAS_LDO1_VOLTAGE,
@@ -487,6 +492,8 @@ static struct regulator_ops palmas_ops_smps10 = {
.set_voltage_sel = regulator_set_voltage_sel_regmap,
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
+ .set_bypass = regulator_set_bypass_regmap,
+ .get_bypass = regulator_get_bypass_regmap,
};
static int palmas_is_enabled_ldo(struct regulator_dev *dev)
@@ -538,7 +545,8 @@ static int palmas_smps_init(struct palmas *palmas, int id,
return ret;
switch (id) {
- case PALMAS_REG_SMPS10:
+ case PALMAS_REG_SMPS10_OUT1:
+ case PALMAS_REG_SMPS10_OUT2:
reg &= ~PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK;
if (reg_init->mode_sleep)
reg |= reg_init->mode_sleep <<
@@ -681,7 +689,8 @@ static struct of_regulator_match palmas_matches[] = {
{ .name = "smps7", },
{ .name = "smps8", },
{ .name = "smps9", },
- { .name = "smps10", },
+ { .name = "smps10_out2", },
+ { .name = "smps10_out1", },
{ .name = "ldo1", },
{ .name = "ldo2", },
{ .name = "ldo3", },
@@ -838,7 +847,8 @@ static int palmas_regulators_probe(struct platform_device *pdev)
continue;
ramp_delay_support = true;
break;
- case PALMAS_REG_SMPS10:
+ case PALMAS_REG_SMPS10_OUT1:
+ case PALMAS_REG_SMPS10_OUT2:
if (!PALMAS_PMIC_HAS(palmas, SMPS10_BOOST))
continue;
}
@@ -872,7 +882,25 @@ static int palmas_regulators_probe(struct platform_device *pdev)
pmic->desc[id].id = id;
switch (id) {
- case PALMAS_REG_SMPS10:
+ case PALMAS_REG_SMPS10_OUT1:
+ pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES;
+ pmic->desc[id].ops = &palmas_ops_smps10;
+ pmic->desc[id].vsel_reg =
+ PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+ PALMAS_SMPS10_CTRL);
+ pmic->desc[id].vsel_mask = SMPS10_VSEL;
+ pmic->desc[id].enable_reg =
+ PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+ PALMAS_SMPS10_CTRL);
+ pmic->desc[id].enable_mask = SMPS10_SWITCH_EN;
+ pmic->desc[id].bypass_reg =
+ PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+ PALMAS_SMPS10_CTRL);
+ pmic->desc[id].bypass_mask = SMPS10_BYPASS_EN;
+ pmic->desc[id].min_uV = 3750000;
+ pmic->desc[id].uV_step = 1250000;
+ break;
+ case PALMAS_REG_SMPS10_OUT2:
pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES;
pmic->desc[id].ops = &palmas_ops_smps10;
pmic->desc[id].vsel_reg =
@@ -883,6 +911,10 @@ static int palmas_regulators_probe(struct platform_device *pdev)
PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
PALMAS_SMPS10_CTRL);
pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
+ pmic->desc[id].bypass_reg =
+ PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+ PALMAS_SMPS10_CTRL);
+ pmic->desc[id].bypass_mask = SMPS10_BYPASS_EN;
pmic->desc[id].min_uV = 3750000;
pmic->desc[id].uV_step = 1250000;
break;
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 1a8dd7a..c06d78a 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -160,7 +160,8 @@ enum palmas_regulators {
PALMAS_REG_SMPS7,
PALMAS_REG_SMPS8,
PALMAS_REG_SMPS9,
- PALMAS_REG_SMPS10,
+ PALMAS_REG_SMPS10_OUT2,
+ PALMAS_REG_SMPS10_OUT1,
/* LDO regulators */
PALMAS_REG_LDO1,
PALMAS_REG_LDO2,
@@ -355,9 +356,9 @@ struct palmas_pmic {
int smps123;
int smps457;
- int range[PALMAS_REG_SMPS10];
- unsigned int ramp_delay[PALMAS_REG_SMPS10];
- unsigned int current_reg_mode[PALMAS_REG_SMPS10];
+ int range[PALMAS_REG_SMPS10_OUT1];
+ unsigned int ramp_delay[PALMAS_REG_SMPS10_OUT1];
+ unsigned int current_reg_mode[PALMAS_REG_SMPS10_OUT1];
};
struct palmas_resource {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] regulator: palmas: model SMPS10 as two regulators
2013-07-01 9:49 [PATCH v3] regulator: palmas: model SMPS10 as two regulators Kishon Vijay Abraham I
@ 2013-07-01 10:01 ` Mark Brown
2013-07-01 10:06 ` Kishon Vijay Abraham I
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2013-07-01 10:01 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: lgirdwood, ldewangan, gg, sameo, j-keerthy, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
On Mon, Jul 01, 2013 at 03:19:42PM +0530, Kishon Vijay Abraham I wrote:
> SMPS10 has two outputs OUT1 and OUT2 and have one input IN1.
> SMPS10-OUT2 is connected to SMPS10-IN1 and can be configured either
> in BOOST mode or BYPASS mode. regulator_enable of SMPS10-OUT2 configures
> it in BOOST mode. For BYPASS mode regulator_allow_bypass() API can be
> used. SMPS10-OUT1 is connected to SMPS10-OUT2 and can be enabled using
> regulator_enable().
This doesn't apply...
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] regulator: palmas: model SMPS10 as two regulators
2013-07-01 10:01 ` Mark Brown
@ 2013-07-01 10:06 ` Kishon Vijay Abraham I
2013-07-01 10:19 ` J, KEERTHY
0 siblings, 1 reply; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2013-07-01 10:06 UTC (permalink / raw)
To: Mark Brown; +Cc: lgirdwood, ldewangan, gg, sameo, j-keerthy, linux-kernel
Hi,
On Monday 01 July 2013 03:31 PM, Mark Brown wrote:
> On Mon, Jul 01, 2013 at 03:19:42PM +0530, Kishon Vijay Abraham I wrote:
>> SMPS10 has two outputs OUT1 and OUT2 and have one input IN1.
>> SMPS10-OUT2 is connected to SMPS10-IN1 and can be configured either
>> in BOOST mode or BYPASS mode. regulator_enable of SMPS10-OUT2 configures
>> it in BOOST mode. For BYPASS mode regulator_allow_bypass() API can be
>> used. SMPS10-OUT1 is connected to SMPS10-OUT2 and can be enabled using
>> regulator_enable().
>
> This doesn't apply...
Ok. Which tree/branch should it be based on?. I created it on next-20130628
as base.
Thanks
Kishon
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v3] regulator: palmas: model SMPS10 as two regulators
2013-07-01 10:06 ` Kishon Vijay Abraham I
@ 2013-07-01 10:19 ` J, KEERTHY
2013-07-01 11:04 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: J, KEERTHY @ 2013-07-01 10:19 UTC (permalink / raw)
To: ABRAHAM, KISHON VIJAY, Mark Brown
Cc: lgirdwood@gmail.com, ldewangan@nvidia.com, gg@slimlogic.co.uk,
sameo@linux.intel.com, linux-kernel@vger.kernel.org
Hi Mark,
> -----Original Message-----
> From: ABRAHAM, KISHON VIJAY
> Sent: Monday, July 01, 2013 3:36 PM
> To: Mark Brown
> Cc: lgirdwood@gmail.com; ldewangan@nvidia.com; gg@slimlogic.co.uk;
> sameo@linux.intel.com; J, KEERTHY; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v3] regulator: palmas: model SMPS10 as two
> regulators
>
> Hi,
>
> On Monday 01 July 2013 03:31 PM, Mark Brown wrote:
> > On Mon, Jul 01, 2013 at 03:19:42PM +0530, Kishon Vijay Abraham I
> wrote:
> >> SMPS10 has two outputs OUT1 and OUT2 and have one input IN1.
> >> SMPS10-OUT2 is connected to SMPS10-IN1 and can be configured either
> >> in BOOST mode or BYPASS mode. regulator_enable of SMPS10-OUT2
> >> configures it in BOOST mode. For BYPASS mode
> regulator_allow_bypass()
> >> API can be used. SMPS10-OUT1 is connected to SMPS10-OUT2 and can be
> >> enabled using regulator_enable().
> >
> > This doesn't apply...
>
> Ok. Which tree/branch should it be based on?. I created it on next-
> 20130628 as base.
I had submitted a patch on the same file which was pulled by Samuel.
Kishon is based on a branch which has my patch. I think that is missing in your
Branch. This is the reason why it is not applying.
>
> Thanks
> Kishon
Regards,
Keerthy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] regulator: palmas: model SMPS10 as two regulators
2013-07-01 10:19 ` J, KEERTHY
@ 2013-07-01 11:04 ` Mark Brown
2013-07-01 11:16 ` Kishon Vijay Abraham I
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2013-07-01 11:04 UTC (permalink / raw)
To: J, KEERTHY
Cc: ABRAHAM, KISHON VIJAY, lgirdwood@gmail.com, ldewangan@nvidia.com,
gg@slimlogic.co.uk, sameo@linux.intel.com,
linux-kernel@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
On Mon, Jul 01, 2013 at 10:19:55AM +0000, J, KEERTHY wrote:
> I had submitted a patch on the same file which was pulled by Samuel.
> Kishon is based on a branch which has my patch. I think that is missing in your
> Branch. This is the reason why it is not applying.
OK, resend after -rc1. Please also roll in Axel's fix.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] regulator: palmas: model SMPS10 as two regulators
2013-07-01 11:04 ` Mark Brown
@ 2013-07-01 11:16 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2013-07-01 11:16 UTC (permalink / raw)
To: Mark Brown
Cc: J, KEERTHY, lgirdwood@gmail.com, ldewangan@nvidia.com,
gg@slimlogic.co.uk, sameo@linux.intel.com,
linux-kernel@vger.kernel.org
On Monday 01 July 2013 04:34 PM, Mark Brown wrote:
> On Mon, Jul 01, 2013 at 10:19:55AM +0000, J, KEERTHY wrote:
>
>> I had submitted a patch on the same file which was pulled by Samuel.
>> Kishon is based on a branch which has my patch. I think that is missing in your
>> Branch. This is the reason why it is not applying.
>
> OK, resend after -rc1. Please also roll in Axel's fix.
Sure. Thanks.
-Kishon
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-07-01 11:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-01 9:49 [PATCH v3] regulator: palmas: model SMPS10 as two regulators Kishon Vijay Abraham I
2013-07-01 10:01 ` Mark Brown
2013-07-01 10:06 ` Kishon Vijay Abraham I
2013-07-01 10:19 ` J, KEERTHY
2013-07-01 11:04 ` Mark Brown
2013-07-01 11:16 ` Kishon Vijay Abraham I
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox