regulator: palmas: model SMPS10 as two regulators
PATCH v3 1/1 regulator: palmas: model SMPS10 as two regulators
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().
---
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(-)
drivers/regulator/palmas-regulator.c +37 -5
@@ -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 ;
include/linux/mfd/palmas.h +5 -4
@@ -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 {
Signature · 1 line
1.7.10.4
Mark Brown
maintainerQuoted 6 lines · Kishon Vijay Abraham I
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_enableof SMPS10-OUT2 configures it in BOOST mode. For BYPASS moderegulator_allow_bypass()API can be used. SMPS10-OUT1 is connected to SMPS10-OUT2 and can be enabled usingregulator_enable().
This doesn't apply...
Hi,
Quoted 9 lines · Mark Brown
Quoted 6 lines · Kishon Vijay Abraham I
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_enableof SMPS10-OUT2 configures it in BOOST mode. For BYPASS moderegulator_allow_bypass()API can be used. SMPS10-OUT1 is connected to SMPS10-OUT2 and can be enabled usingregulator_enable().This doesn't apply...
Ok. Which tree/branch should it be based on?. I created it on next-20130628 as base.
Thanks
Kishon
Hi Mark,
Quoted 18 lines
-----Original Message-----
From: ABRAHAM, KISHON VIJAY
Sent: Monday, July 01, 2013 3:36 PM
To: Mark Brown
Cc: [email protected]; [email protected]; [email protected]; [email protected]; J, KEERTHY; [email protected]
Subject: Re: [PATCH v3] regulator: palmas: model SMPS10 as two regulatorsHi,
Quoted 1 line · Mark Brown
On Mon, Jul 01, 2013 at 03:19:42PM +0530, Kishon Vijay Abraham I
Quoted 4 lines · wrote:
Quoted 4 lines
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_enableof SMPS10-OUT2 configures it in BOOST mode. For BYPASS mode
Quoted 8 lines
regulator_allow_bypass()Quoted 4 lines
Quoted 2 lines
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.
Quoted 3 lines
Thanks
Kishon
Regards,
Keerthy
Mark Brown
maintainerQuoted 3 lines · KEERTHY
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.
Quoted 7 lines · Mark Brown
Quoted 3 lines · KEERTHY
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