Regulators: Bring the AB8500 into the 21st century
Subsystems (5)
cover Regulators: Bring the AB8500 into the 21st century
Hi Mark,
As requested, the whole-shebang. Hopefully this patch-set is less bitty and depressing to review now. Honestly, the things I do for you. :)
The Mainline AB8500 and DB8500 regulators are currently stuck in the Victorian era (AKA v2.6.35). This branch contains all of the upstreamable changes that have occurred on the internal repository and aims to bring them back into the 21st century.
This patch-set contains 49 of the original 111 patches and has already gone though multiple (+1) cycles of fixing-up, squashing, splitting and revert removal. I've also taken out all of the OF, PRCMU and -debug bits at your request.
arch/arm/mach-ux500/board-mop500-regulators.c | 730 ++++++- arch/arm/mach-ux500/board-mop500-regulators.h | 7 +- arch/arm/mach-ux500/board-mop500.c | 5 +- drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/ab8500-ext.c | 475 +++++ drivers/regulator/ab8500.c | 2732 +++++++++++++++++++++++-- include/linux/mfd/abx500/ab8500.h | 11 +- include/linux/regulator/ab8500.h | 228 ++- 9 files changed, 3950 insertions(+), 247 deletions(-)
PATCH 1/49 regulator: ab8500: Further populate initialisation registers
This patch supplies access to some extra settings provided by the AB8500 regulator device. We also update some of the existing initialisation values in accordance with internal ST-Ericsson code submissions. This single patch was originally a collection of updates which have been squashed together to aid with clarity.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 40 +++++++++++++++++++++++-- drivers/regulator/ab8500.c | 39 ++++++++++++++++++++++-- include/linux/regulator/ab8500.h | 8 +++++ 3 files changed, 81 insertions(+), 6 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +37 -3
@@ -126,6 +126,7 @@ struct ab8500_regulator_reg_init ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {/* * VanaRequestCtrl = HP/LP depending on VxRequest +* VpllRequestCtrl = HP/LP depending on VxRequest * VextSupply1RequestCtrl = HP/LP depending on VxRequest */ INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0x00),
@@ -142,12 +143,16 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {*/ INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL4 ,0x00 ),/* +* Vsmps1SysClkReq1HPValid = enabled +* Vsmps2SysClkReq1HPValid = enabled +* Vsmps3SysClkReq1HPValid = enabled * VanaSysClkReq1HPValid = disabled +* VpllSysClkReq1HPValid = enabled * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x17),/* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled
@@ -234,6 +239,34 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {*/ INIT_REGULATOR_REGISTER (AB8500_REGUCTRL1VAMIC ,0x00 ),/* +* VBBN = force OFF +* VBBP = force OFF +* NOTE! PRCMU register +*/ +INIT_REGULATOR_REGISTER (AB8500_ARMREGU2 ,0x00 ), +/* +* VBBNSel1 = VBBP = VBBPFB +* VBBPSel1 = 0 V +* NOTE! PRCMU register +*/ +INIT_REGULATOR_REGISTER (AB8500_VBBSEL1 ,0x00 ), +/* +* VBBNSel2 = VBBP = VBBPFB +* VBBPSel2 = 0 V +* NOTE! PRCMU register +*/ +INIT_REGULATOR_REGISTER (AB8500_VBBSEL2 ,0x00 ), +/* +* Vsmps1Regu = HW control +* Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 +*/ +INIT_REGULATOR_REGISTER (AB8500_VSMPS1REGU ,0x06 ), +/* +* Vsmps2Regu = HW control +* Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 +*/ +INIT_REGULATOR_REGISTER (AB8500_VSMPS2REGU ,0x06 ), +/* * VPll = Hw controlled * VanaRegu = force off */
@@ -257,9 +290,10 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {*/ INIT_REGULATOR_REGISTER (AB8500_VAUX12REGU ,0x01 ),/* -* Vaux3regu = force off +* Vrf1Regu = HW control +* Vaux3Regu = force off */ - INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x00), + INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x08),/* * Vsmps1 = 1.15V */
drivers/regulator/ab8500.c +36 -3
@@ -477,7 +477,7 @@ struct ab8500_reg_init {static struct ab8500_reg_init ab8500_reg_init[] = {/* * 0x30, VanaRequestCtrl -* 0x0C, VpllRequestCtrl +* 0x0c, VpllRequestCtrl * 0xc0, VextSupply1RequestCtrl */ REG_INIT (AB8500_REGUREQUESTCTRL2 ,0x03 ,0x04 ,0xfc ),
@@ -494,12 +494,16 @@ static struct ab8500_reg_init ab8500_reg_init[] = {*/ REG_INIT (AB8500_REGUREQUESTCTRL4 ,0x03 ,0x06 ,0x07 ),/* +* 0x01, Vsmps1SysClkReq1HPValid +* 0x02, Vsmps2SysClkReq1HPValid +* 0x04, Vsmps3SysClkReq1HPValid * 0x08, VanaSysClkReq1HPValid +* 0x10, VpllSysClkReq1HPValid * 0x20, Vaux1SysClkReq1HPValid * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xe8), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xff),/* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid
@@ -578,6 +582,34 @@ static struct ab8500_reg_init ab8500_reg_init[] = {*/ REG_INIT (AB8500_REGUCTRL1VAMIC ,0x03 ,0x84 ,0x03 ),/* +* 0x0c, VBBNRegu +* 0x03, VBBPRegu +* NOTE! PRCMU register +*/ +REG_INIT (AB8500_ARMREGU2 ,0x04 ,0x01 ,0x0f ), +/* +* 0x0c, VBBPSel1 +* 0x03, VBBNSel1 +* NOTE! PRCMU register +*/ +REG_INIT (AB8500_VBBSEL1 ,0x04 ,0x11 ,0x0f ), +/* +* 0x0c, VBBNSel2 +* 0x03, VBBPSel2 +* NOTE! PRCMU register +*/ +REG_INIT (AB8500_VBBSEL2 ,0x04 ,0x12 ,0x0f ), +/* +* 0x03, Vsmps1Regu +* 0x0c, Vsmps1SelCtrl +*/ +REG_INIT (AB8500_VSMPS1REGU ,0x04 ,0x03 ,0x0f ), +/* +* 0x03, Vsmps2Regu +* 0x0c, Vsmps2SelCtrl +*/ +REG_INIT (AB8500_VSMPS2REGU ,0x04 ,0x04 ,0x0f ), +/* * 0x0c, VanaRegu * 0x03, VpllRegu */
@@ -601,9 +633,10 @@ static struct ab8500_reg_init ab8500_reg_init[] = {*/ REG_INIT (AB8500_VAUX12REGU ,0x04 ,0x09 ,0x0f ),/* +* 0x0c, Vrf1Regu * 0x03, Vaux3Regu */ - REG_INIT(AB8500_VRF1VAUX3REGU, 0x04, 0x0a, 0x03), + REG_INIT(AB8500_VRF1VAUX3REGU, 0x04, 0x0a, 0x0f),/* * 0x3f, Vsmps1Sel1 */
include/linux/regulator/ab8500.h +8 -0
@@ -86,7 +86,15 @@ enum ab8500_regulator_reg {AB8500_REGUCTRL2SPARE ,AB8500_REGUCTRLDISCH ,AB8500_REGUCTRLDISCH2 , +AB8500_ARMREGU2 ,/* NOTE! PRCMU register */ +AB8500_VBBSEL1 ,/* NOTE! PRCMU register */ +AB8500_VBBSEL2 ,/* NOTE! PRCMU register */ +AB8500_VSMPS1REGU , +AB8500_VSMPS2REGU , +AB8500_VSMPS3REGU ,/* NOTE! PRCMU register */ AB8500_VSMPS1SEL1 , +AB8500_VSMPS3SEL1 ,/* NOTE! PRCMU register */ +AB8500_VSMPS3SEL2 ,/* NOTE! PRCMU register */ AB8500_NUM_REGULATOR_REGISTERS, };
Signature · 1 line
1.7.9.5
Re: [PATCH 01/49] regulator: ab8500: Further populate initialisation registers
Quoted 5 lines · Lee Jones
This patch supplies access to some extra settings provided by the AB8500 regulator device. We also update some of the existing initialisation values in accordance with internal ST-Ericsson code submissions. This single patch was originally a collection of updates which have been squashed together to aid with clarity.
I tried to apply this but got conflicts - can you please check what's going on with this vs my topic/ab8500 branch?
Re: [PATCH 01/49] regulator: ab8500: Further populate initialisation registers
Quoted 9 lines · Mark Brown
Quoted 5 lines · Lee Jones
This patch supplies access to some extra settings provided by the AB8500 regulator device. We also update some of the existing initialisation values in accordance with internal ST-Ericsson code submissions. This single patch was originally a collection of updates which have been squashed together to aid with clarity.
I tried to apply this but got conflicts - can you please check what's going on with this vs my topic/ab8500 branch?
It's almost certainly because you're trying to pull the patches in out of order. This _will_ end in conflicts. Any chance you can start from 01 and work your way though them. I will fixup any that you don't like on the fly.
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 01/49] regulator: ab8500: Further populate initialisation registers
Quoted 9 lines · Lee Jones
Quoted 2 lines · Mark Brown
I tried to apply this but got conflicts - can you please check what's going on with this vs my topic/ab8500 branch?
It's almost certainly because you're trying to pull the patches in out of order. This _will_ end in conflicts. Any chance you can start from 01 and work your way though them. I will fixup any that you don't like on the fly.
Just following up on our IRC discussion I think that the issue here is you're basing on -rc not on the topic branch - the patches are going in pretty much in order, there's no meaningful reordering going on. I am picking things from the start of the several unrelated topics that are mixed in randomly in the series but there should be no overlap here.
If you just rebase off the topic branch while you do your fixups git ought to drop the patches for you most of the time.
PATCH 2/49 regulator: ab8500: Add set_mode/get_mode support
In reply to Lee JonesFrom: Emeric Vigier <[email protected]>
--- drivers/regulator/ab8500.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)
drivers/regulator/ab8500.c +71 -0
@@ -33,6 +33,8 @@* @update_bank: bank to control on/off * @update_reg: register to control on/off * @update_mask: mask to enable/disable regulator +* @update_val: bits holding the regulator current mode +* @update_val_idle: bits to enable the regulator in idle (low power) mode * @update_val_enable: bits to enable the regulator in normal (high power) mode * @voltage_bank: bank to control regulator voltage * @voltage_reg: register to control regulator voltage
@@ -47,6 +49,8 @@ struct ab8500_regulator_info {u8 update_bank;u8 update_reg;u8 update_mask; +u8 update_val; +u8 update_val_idle;u8 update_val_enable;u8 voltage_bank;u8 voltage_reg;
@@ -146,6 +150,63 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)return ret; } +static int ab8500_regulator_set_mode (struct regulator_dev *rdev,unsigned int mode) +{ +struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); + +if (info ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +return -EINVAL ; + } + +/* +* update_val_enable is protected by mutex +* into regulator/core.c layout +*/ +switch (mode) { +case REGULATOR_MODE_NORMAL : + info->update_val = info->update_val_enable; +break ; +case REGULATOR_MODE_IDLE : + info->update_val = info->update_val_idle; +break ; +default : +return -EINVAL ; + } + +return ab8500_regulator_enable (rdev); +} + +static unsigned int ab8500_regulator_get_mode (struct regulator_dev *rdev) +{ +struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); +int ret; +u8 regval; + +if (info ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +return -EINVAL ; + } + + ret =abx500_get_register_interruptible (info->dev, + info->update_bank, info->update_reg, ®val); +if (ret <0 ) { +dev_err (rdev_get_dev (rdev), +"couldn't read 0x%x register\n" , info->update_reg); +return ret; + } + + regval &=info->update_mask; +if (regval == info->update_val_enable) + ret =REGULATOR_MODE_NORMAL ; +else if (regval == info->update_val_idle) + ret =REGULATOR_MODE_IDLE ; +else + ret = -EINVAL ; + +return ret; +} +static int ab8500_regulator_is_enabled (struct regulator_dev *rdev) {int ret;
@@ -249,6 +310,8 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,static struct regulator_ops ab8500_regulator_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, + .set_mode = ab8500_regulator_set_mode, + .get_mode = ab8500_regulator_get_mode, .is_enabled = ab8500_regulator_is_enabled, .get_voltage_sel = ab8500_regulator_get_voltage_sel, .set_voltage_sel = ab8500_regulator_set_voltage_sel,
@@ -284,6 +347,8 @@ static struct ab8500_regulator_info .update_bank = 0x04, .update_reg = 0x09, .update_mask = 0x03, + .update_val = 0x01, + .update_val_idle = 0x03, .update_val_enable = 0x01, .voltage_bank = 0x04, .voltage_reg = 0x1f,
@@ -302,6 +367,8 @@ static struct ab8500_regulator_info .update_bank = 0x04, .update_reg = 0x09, .update_mask = 0x0c, + .update_val = 0x04, + .update_val_idle = 0x0c, .update_val_enable = 0x04, .voltage_bank = 0x04, .voltage_reg = 0x20,
@@ -320,6 +387,8 @@ static struct ab8500_regulator_info .update_bank = 0x04, .update_reg = 0x0a, .update_mask = 0x03, + .update_val = 0x01, + .update_val_idle = 0x03, .update_val_enable = 0x01, .voltage_bank = 0x04, .voltage_reg = 0x21,
@@ -338,6 +407,8 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x80, .update_mask = 0x44, + .update_val = 0x04, + .update_val_idle = 0x44, .update_val_enable = 0x04, .voltage_bank = 0x03, .voltage_reg = 0x80,
Signature · 1 line
1.7.9.5
PATCH 3/49 regulator: ab8500: Fix for regulator_set_mode functionality
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
--- drivers/regulator/ab8500.c | 78 ++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 36 deletions(-)
drivers/regulator/ab8500.c +42 -36
@@ -30,12 +30,13 @@* @dev: device pointer * @desc: regulator description * @regulator_dev: regulator device +* @is_enabled: status of regulator (on/off) * @update_bank: bank to control on/off * @update_reg: register to control on/off -* @update_mask: mask to enable/disable regulator +* @update_mask: mask to enable/disable and set mode of regulator * @update_val: bits holding the regulator current mode * @update_val_idle: bits to enable the regulator in idle (low power) mode -* @update_val_enable: bits to enable the regulator in normal (high power) mode +* @update_val_normal: bits to enable the regulator in normal (high power) mode * @voltage_bank: bank to control regulator voltage * @voltage_reg: register to control regulator voltage * @voltage_mask: mask to control regulator voltage
@@ -46,12 +47,13 @@ struct ab8500_regulator_info {struct device *dev;struct regulator_desc desc;struct regulator_dev *regulator; +bool is_enabled;u8 update_bank;u8 update_reg;u8 update_mask;u8 update_val;u8 update_val_idle; -u8 update_val_enable; +u8 update_val_normal;u8 voltage_bank;u8 voltage_reg;u8 voltage_mask;
@@ -112,15 +114,17 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev) ret =abx500_mask_and_set_register_interruptible (info->dev, info->update_bank, info->update_reg, - info->update_mask, info->update_val_enable); + info->update_mask, info->update_val);if (ret <0 )dev_err (rdev_get_dev (rdev),"couldn't set enable bits for regulator\n" ); + info->is_enabled = true; +dev_vdbg (rdev_get_dev (rdev),"%s-enable (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n" , info->desc.name, info->update_bank, info->update_reg, - info->update_mask, info->update_val_enable); + info->update_mask, info->update_val);return ret; }
@@ -142,6 +146,8 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)dev_err (rdev_get_dev (rdev),"couldn't set disable bits for regulator\n" ); + info->is_enabled = false; + dev_vdbg(rdev_get_dev(rdev), "%s-disable (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n", info->desc.name, info->update_bank, info->update_reg,
@@ -150,8 +156,11 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)return ret; } -static int ab8500_regulator_set_mode (struct regulator_dev *rdev,unsigned int mode) +static int ab8500_regulator_set_mode (struct regulator_dev *rdev, +unsigned int mode) { +int ret =0 ; +struct ab8500_regulator_info *info =rdev_get_drvdata (rdev);if (info ==NULL ) {
@@ -159,13 +168,9 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev, unsigned int moreturn -EINVAL ; } -/* -* update_val_enable is protected by mutex -* into regulator/core.c layout -*/ switch (mode) {case REGULATOR_MODE_NORMAL : - info->update_val = info->update_val_enable; + info->update_val = info->update_val_normal;break ;case REGULATOR_MODE_IDLE : info->update_val = info->update_val_idle;
@@ -174,32 +179,31 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev, unsigned int moreturn -EINVAL ; } -return ab8500_regulator_enable (rdev); +if (info->is_enabled) { + ret =abx500_mask_and_set_register_interruptible (info->dev, + info->update_bank, info->update_reg, + info->update_mask, info->update_val); +if (ret <0 ) +dev_err (rdev_get_dev (rdev), +"couldn't set regulator mode\n" ); + } + +return ret; }static unsigned int ab8500_regulator_get_mode (struct regulator_dev *rdev) {struct ab8500_regulator_info *info =rdev_get_drvdata (rdev);int ret; -u8 regval;if (info ==NULL ) {dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" );return -EINVAL ; } - ret =abx500_get_register_interruptible (info->dev, - info->update_bank, info->update_reg, ®val); -if (ret <0 ) { -dev_err (rdev_get_dev (rdev), -"couldn't read 0x%x register\n" , info->update_reg); -return ret; - } - - regval &=info->update_mask; -if (regval == info->update_val_enable) +if (info->update_val == info->update_val_normal) ret =REGULATOR_MODE_NORMAL ; -else if (regval == info->update_val_idle) +else if (info->update_val == info->update_val_idle) ret =REGULATOR_MODE_IDLE ;else ret = -EINVAL ;
@@ -233,9 +237,11 @@ static int ab8500_regulator_is_enabled(struct regulator_dev *rdev) info->update_mask, regval);if (regval & info->update_mask) -return true; + info->is_enabled = true;else -return false; + info->is_enabled = false; + +return info->is_enabled; }static int ab8500_regulator_get_voltage_sel (struct regulator_dev *rdev)
@@ -349,7 +355,7 @@ static struct ab8500_regulator_info .update_mask = 0x03, .update_val = 0x01, .update_val_idle = 0x03, - .update_val_enable = 0x01, + .update_val_normal = 0x01, .voltage_bank = 0x04, .voltage_reg = 0x1f, .voltage_mask = 0x0f,
@@ -369,7 +375,7 @@ static struct ab8500_regulator_info .update_mask = 0x0c, .update_val = 0x04, .update_val_idle = 0x0c, - .update_val_enable = 0x04, + .update_val_normal = 0x04, .voltage_bank = 0x04, .voltage_reg = 0x20, .voltage_mask = 0x0f,
@@ -389,7 +395,7 @@ static struct ab8500_regulator_info .update_mask = 0x03, .update_val = 0x01, .update_val_idle = 0x03, - .update_val_enable = 0x01, + .update_val_normal = 0x01, .voltage_bank = 0x04, .voltage_reg = 0x21, .voltage_mask = 0x07,
@@ -409,7 +415,7 @@ static struct ab8500_regulator_info .update_mask = 0x44, .update_val = 0x04, .update_val_idle = 0x44, - .update_val_enable = 0x04, + .update_val_normal = 0x04, .voltage_bank = 0x03, .voltage_reg = 0x80, .voltage_mask = 0x38,
@@ -436,7 +442,7 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x80, .update_mask = 0x82, - .update_val_enable = 0x02, + .update_val = 0x02, }, [AB8500_LDO_USB] = { .desc = {
@@ -466,7 +472,7 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x02, - .update_val_enable = 0x02, + .update_val = 0x02, }, [AB8500_LDO_ANAMIC1] = { .desc = {
@@ -481,7 +487,7 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x08, - .update_val_enable = 0x08, + .update_val = 0x08, }, [AB8500_LDO_ANAMIC2] = { .desc = {
@@ -496,7 +502,7 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x10, - .update_val_enable = 0x10, + .update_val = 0x10, }, [AB8500_LDO_DMIC] = { .desc = {
@@ -511,7 +517,7 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x04, - .update_val_enable = 0x04, + .update_val = 0x04, }, [AB8500_LDO_ANA] = { .desc = {
@@ -526,7 +532,7 @@ static struct ab8500_regulator_info .update_bank = 0x04, .update_reg = 0x06, .update_mask = 0x0c, - .update_val_enable = 0x04, + .update_val = 0x04, },
Signature · 1 line
1.7.9.5
Re: [PATCH 03/49] regulator: ab8500: Fix for regulator_set_mode functionality
Quoted 4 lines · Lee Jones
From: Bengt Jonsson <[email protected]>
Signed-off-by Bengt Jonsson <[email protected]>Signed-off-by Lee Jones <[email protected]>
I applied this and the previous patch squashed together - this fixes code added in the previous commit!
PATCH 4/49 regulator: ab8500: Added get_optimum_mode on regulators with idle mode
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
With this change, Vtvout, Vintcore12, Vaux1, 2 and 3 regulators support DRMS (Dynamic Regulator Mode Switching) which will dynamically handle requests for max current consumption from several consumers and select a suitable regulator mode.
--- drivers/regulator/ab8500.c | 115 +++++++++++++++++++++++++++++++++----------- 1 file changed, 88 insertions(+), 27 deletions(-)
drivers/regulator/ab8500.c +88 -27
@@ -31,6 +31,7 @@* @desc: regulator description * @regulator_dev: regulator device * @is_enabled: status of regulator (on/off) +* @load_lp_uA: maximum load in idle (low power) mode * @update_bank: bank to control on/off * @update_reg: register to control on/off * @update_mask: mask to enable/disable and set mode of regulator
@@ -48,6 +49,7 @@ struct ab8500_regulator_info {struct regulator_desc desc;struct regulator_dev *regulator;bool is_enabled; +int load_lp_uA;u8 update_bank;u8 update_reg;u8 update_mask;
@@ -156,6 +158,27 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)return ret; } +static unsigned int ab8500_regulator_get_optimum_mode ( +struct regulator_dev *rdev,int input_uV, +int output_uV,int load_uA) +{ +unsigned int mode; + +struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); + +if (info ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +return -EINVAL ; + } + +if (load_uA <= info->load_lp_uA) + mode =REGULATOR_MODE_IDLE ; +else + mode =REGULATOR_MODE_NORMAL ; + +return mode; +} +static int ab8500_regulator_set_mode (struct regulator_dev *rdev,unsigned int mode) {
@@ -186,6 +209,12 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,if (ret <0 )dev_err (rdev_get_dev (rdev),"couldn't set regulator mode\n" ); + +dev_vdbg (rdev_get_dev (rdev), +"%s-set_mode (bank, reg, mask, value): " +"0x%x, 0x%x, 0x%x, 0x%x\n" , + info->desc.name, info->update_bank, info->update_reg, + info->update_mask, info->update_val); }return ret;
@@ -313,29 +342,43 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,return info->delay; } -static struct regulator_ops ab8500_regulator_ops = { - .enable = ab8500_regulator_enable, - .disable = ab8500_regulator_disable, - .set_mode = ab8500_regulator_set_mode, - .get_mode = ab8500_regulator_get_mode, - .is_enabled = ab8500_regulator_is_enabled, - .get_voltage_sel = ab8500_regulator_get_voltage_sel, - .set_voltage_sel = ab8500_regulator_set_voltage_sel, - .list_voltage = regulator_list_voltage_table, - .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, +static struct regulator_ops ab8500_regulator_volt_mode_ops = { + .enable = ab8500_regulator_enable, + .disable = ab8500_regulator_disable, + .is_enabled = ab8500_regulator_is_enabled, + .get_optimum_mode = ab8500_regulator_get_optimum_mode, + .set_mode = ab8500_regulator_set_mode, + .get_mode = ab8500_regulator_get_mode, + .get_voltage_sel = ab8500_regulator_get_voltage_sel, + .set_voltage_sel = ab8500_regulator_set_voltage_sel, + .list_voltage = regulator_list_voltage_table, + .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, }; -static struct regulator_ops ab8500_regulator_fixed_ops = { - .enable = ab8500_regulator_enable, - .disable = ab8500_regulator_disable, - .is_enabled = ab8500_regulator_is_enabled, - .list_voltage = regulator_list_voltage_linear, +static struct regulator_ops ab8500_regulator_mode_ops = { + .enable = ab8500_regulator_enable, + .disable = ab8500_regulator_disable, + .is_enabled = ab8500_regulator_is_enabled, + .get_optimum_mode = ab8500_regulator_get_optimum_mode, + .set_mode = ab8500_regulator_set_mode, + .get_mode = ab8500_regulator_get_mode, + .get_voltage_sel = ab8500_regulator_get_voltage_sel, + .list_voltage = regulator_list_voltage_table, + .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, +}; + +static struct regulator_ops ab8500_regulator_ops = { + .enable = ab8500_regulator_enable, + .disable = ab8500_regulator_disable, + .is_enabled = ab8500_regulator_is_enabled, + .get_voltage_sel = ab8500_regulator_get_voltage_sel, + .list_voltage = regulator_list_voltage_table, };static struct ab8500_regulator_info ab8500_regulator_info[AB8500_NUM_REGULATORS ] = {/* -* Variable Voltage Regulators +* Regulators with variable voltage and normal/idle modes * name, min mV, max mV, * update bank, reg, mask, enable val * volt bank, reg, mask
@@ -343,13 +386,14 @@ static struct ab8500_regulator_info [AB8500_LDO_AUX1] = { .desc = { .name = "LDO-AUX1", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages, }, + .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x09, .update_mask = 0x03,
@@ -363,13 +407,14 @@ static struct ab8500_regulator_info [AB8500_LDO_AUX2] = { .desc = { .name = "LDO-AUX2", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages, }, + .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x09, .update_mask = 0x0c,
@@ -383,13 +428,14 @@ static struct ab8500_regulator_info [AB8500_LDO_AUX3] = { .desc = { .name = "LDO-AUX3", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), .volt_table = ldo_vaux3_voltages, }, + .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x0a, .update_mask = 0x03,
@@ -403,13 +449,14 @@ static struct ab8500_regulator_info [AB8500_LDO_INTCORE] = { .desc = { .name = "LDO-INTCORE", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .volt_table = ldo_vintcore_voltages, }, + .load_lp_uA = 5000, .update_bank = 0x03, .update_reg = 0x80, .update_mask = 0x44,
@@ -423,14 +470,14 @@ static struct ab8500_regulator_info }, /* - * Fixed Voltage Regulators + * Regulators with fixed voltage and normal/idle modes * name, fixed mV, * update bank, reg, mask, enable val */ [AB8500_LDO_TVOUT] = { .desc = { .name = "LDO-TVOUT", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_TVOUT, .owner = THIS_MODULE,
@@ -439,10 +486,13 @@ static struct ab8500_regulator_info .enable_time = 10000, }, .delay = 10000, + .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80, .update_mask = 0x82, .update_val = 0x02, + .update_val_idle = 0x82, + .update_val_normal = 0x02, }, [AB8500_LDO_USB] = { .desc = {
@@ -459,10 +509,14 @@ static struct ab8500_regulator_info .update_mask = 0x03, .update_val_enable = 0x01, }, + +/* +* Regulators with fixed voltage and normal mode +*/ [AB8500_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_AUDIO, .owner = THIS_MODULE,
@@ -477,7 +531,7 @@ static struct ab8500_regulator_info [AB8500_LDO_ANAMIC1] = { .desc = { .name = "LDO-ANAMIC1", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_ANAMIC1, .owner = THIS_MODULE,
@@ -492,7 +546,7 @@ static struct ab8500_regulator_info [AB8500_LDO_ANAMIC2] = { .desc = { .name = "LDO-ANAMIC2", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_ANAMIC2, .owner = THIS_MODULE,
@@ -507,7 +561,7 @@ static struct ab8500_regulator_info [AB8500_LDO_DMIC] = { .desc = { .name = "LDO-DMIC", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_DMIC, .owner = THIS_MODULE,
@@ -519,20 +573,27 @@ static struct ab8500_regulator_info .update_mask = 0x04, .update_val = 0x04, }, + +/* +* Regulators with fixed voltage and normal/idle modes +*/ [AB8500_LDO_ANA] = { .desc = { .name = "LDO-ANA", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, .min_uV = 1200000, }, + .load_lp_uA = 1000, .update_bank = 0x04, .update_reg = 0x06, .update_mask = 0x0c, .update_val = 0x04, + .update_val_idle = 0x0c, + .update_val_normal = 0x04, },
Signature · 1 line
1.7.9.5
Mark Brown
AppliedRe: [PATCH 04/49] regulator: ab8500: Added get_optimum_mode on regulators with idle mode
Quoted 6 lines · Lee Jones
From: Bengt Jonsson <[email protected]>
With this change, Vtvout, Vintcore12, Vaux1, 2 and 3 regulators support DRMS (Dynamic Regulator Mode Switching) which will dynamically handle requests for max current consumption from several consumers and select a suitable regulator mode.
Applied, thanks.
PATCH 5/49 ARM: ux500: regulators: Add mask for configuration
In reply to Lee JonesThere is already before a register mask in the regulator driver to allow some bits of a register to be initialized. The register value is defined in the board configuration. This patch puts a mask in the board configuration to specify which bits should actually be altered. The purpose with this patch is to avoid future mistakes when updating the allowed bits in the regulator driver.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 66 ++++++++++++------------- drivers/regulator/ab8500.c | 36 ++++++-------- include/linux/regulator/ab8500.h | 10 ++-- 3 files changed, 53 insertions(+), 59 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +33 -33
@@ -129,19 +129,19 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* VpllRequestCtrl = HP/LP depending on VxRequest * VextSupply1RequestCtrl = HP/LP depending on VxRequest */ -INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL2 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL2 ,0xfc ,0x00 ),/* * VextSupply2RequestCtrl = HP/LP depending on VxRequest * VextSupply3RequestCtrl = HP/LP depending on VxRequest * Vaux1RequestCtrl = HP/LP depending on VxRequest * Vaux2RequestCtrl = HP/LP depending on VxRequest */ -INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL3 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL3 ,0xff ,0x00 ),/* * Vaux3RequestCtrl = HP/LP depending on VxRequest * SwHPReq = Control through SWValid disabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x07, 0x00),/* * Vsmps1SysClkReq1HPValid = enabled * Vsmps2SysClkReq1HPValid = enabled
@@ -152,44 +152,44 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled */ -INIT_REGULATOR_REGISTER (AB8500_REGUSYSCLKREQ1HPVALID1 ,0x17 ), +INIT_REGULATOR_REGISTER (AB8500_REGUSYSCLKREQ1HPVALID1 ,0xff ,0x17 ),/* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled * VextSupply3SysClkReq1HPValid = SysClkReq1 controlled */ -INIT_REGULATOR_REGISTER (AB8500_REGUSYSCLKREQ1HPVALID2 ,0x40 ), +INIT_REGULATOR_REGISTER (AB8500_REGUSYSCLKREQ1HPVALID2 ,0x70 ,0x40 ),/* * VanaHwHPReq1Valid = disabled * Vaux1HwHPreq1Valid = disabled * Vaux2HwHPReq1Valid = disabled * Vaux3HwHPReqValid = disabled */ -INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ1VALID1 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ1VALID1 ,0xe8 ,0x00 ),/* * VextSupply1HwHPReq1Valid = disabled * VextSupply2HwHPReq1Valid = disabled * VextSupply3HwHPReq1Valid = disabled */ -INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ1VALID2 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ1VALID2 ,0x07 ,0x00 ),/* * VanaHwHPReq2Valid = disabled * Vaux1HwHPReq2Valid = disabled * Vaux2HwHPReq2Valid = disabled * Vaux3HwHPReq2Valid = disabled */ -INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ2VALID1 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ2VALID1 ,0xe8 ,0x00 ),/* * VextSupply1HwHPReq2Valid = disabled * VextSupply2HwHPReq2Valid = disabled * VextSupply3HwHPReq2Valid = HWReq2 controlled */ -INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ2VALID2 ,0x04 ), +INIT_REGULATOR_REGISTER (AB8500_REGUHWHPREQ2VALID2 ,0x07 ,0x04 ),/* * VanaSwHPReqValid = disabled * Vaux1SwHPReqValid = disabled */ -INIT_REGULATOR_REGISTER (AB8500_REGUSWHPREQVALID1 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUSWHPREQVALID1 ,0xa0 ,0x00 ),/* * Vaux2SwHPReqValid = disabled * Vaux3SwHPReqValid = disabled
@@ -197,7 +197,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* VextSupply2SwHPReqValid = disabled * VextSupply3SwHPReqValid = disabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2, 0x1f, 0x00),/* * SysClkReq2Valid1 = SysClkReq2 controlled * SysClkReq3Valid1 = disabled
@@ -207,7 +207,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* SysClkReq7Valid1 = disabled * SysClkReq8Valid1 = disabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1, 0x2a), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1, 0xfe, 0x2a),/* * SysClkReq2Valid2 = disabled * SysClkReq3Valid2 = disabled
@@ -217,7 +217,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* SysClkReq7Valid2 = disabled * SysClkReq8Valid2 = disabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2, 0x20), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2, 0xfe, 0x20),/* * VTVoutEna = disabled * Vintcore12Ena = disabled
@@ -225,57 +225,57 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* Vintcore12LP = inactive (HP) * VTVoutLP = inactive (HP) */ -INIT_REGULATOR_REGISTER (AB8500_REGUMISC1 ,0x10 ), +INIT_REGULATOR_REGISTER (AB8500_REGUMISC1 ,0xfe ,0x10 ),/* * VaudioEna = disabled * VdmicEna = disabled * Vamic1Ena = disabled * Vamic2Ena = disabled */ -INIT_REGULATOR_REGISTER (AB8500_VAUDIOSUPPLY ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_VAUDIOSUPPLY ,0x1e ,0x00 ),/* * Vamic1_dzout = high-Z when Vamic1 is disabled * Vamic2_dzout = high-Z when Vamic2 is disabled */ -INIT_REGULATOR_REGISTER (AB8500_REGUCTRL1VAMIC ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUCTRL1VAMIC ,0x03 ,0x00 ),/* * VBBN = force OFF * VBBP = force OFF * NOTE! PRCMU register */ -INIT_REGULATOR_REGISTER (AB8500_ARMREGU2 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_ARMREGU2 ,0x0f ,0x00 ),/* * VBBNSel1 = VBBP = VBBPFB * VBBPSel1 = 0 V * NOTE! PRCMU register */ -INIT_REGULATOR_REGISTER (AB8500_VBBSEL1 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_VBBSEL1 ,0x0f ,0x00 ),/* * VBBNSel2 = VBBP = VBBPFB * VBBPSel2 = 0 V * NOTE! PRCMU register */ -INIT_REGULATOR_REGISTER (AB8500_VBBSEL2 ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_VBBSEL2 ,0x0f ,0x00 ),/* * Vsmps1Regu = HW control * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 */ -INIT_REGULATOR_REGISTER (AB8500_VSMPS1REGU ,0x06 ), +INIT_REGULATOR_REGISTER (AB8500_VSMPS1REGU ,0x0f ,0x06 ),/* * Vsmps2Regu = HW control * Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 */ -INIT_REGULATOR_REGISTER (AB8500_VSMPS2REGU ,0x06 ), +INIT_REGULATOR_REGISTER (AB8500_VSMPS2REGU ,0x0f ,0x06 ),/* * VPll = Hw controlled * VanaRegu = force off */ -INIT_REGULATOR_REGISTER (AB8500_VPLLVANAREGU ,0x02 ), +INIT_REGULATOR_REGISTER (AB8500_VPLLVANAREGU ,0x0f ,0x02 ),/* * VrefDDREna = disabled * VrefDDRSleepMode = inactive (no pulldown) */ -INIT_REGULATOR_REGISTER (AB8500_VREFDDR ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_VREFDDR ,0x03 ,0x00 ),/* * VextSupply1Regu = HW control * VextSupply2Regu = HW control
@@ -283,37 +283,37 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* ExtSupply2Bypass = ExtSupply12LPn ball is 0 when Ena is 0 * ExtSupply3Bypass = ExtSupply3LPn ball is 0 when Ena is 0 */ -INIT_REGULATOR_REGISTER (AB8500_EXTSUPPLYREGU ,0x2a ), +INIT_REGULATOR_REGISTER (AB8500_EXTSUPPLYREGU ,0xff ,0x1a ),/* * Vaux1Regu = force HP * Vaux2Regu = force off */ -INIT_REGULATOR_REGISTER (AB8500_VAUX12REGU ,0x01 ), +INIT_REGULATOR_REGISTER (AB8500_VAUX12REGU ,0x0f ,0x01 ),/* * Vrf1Regu = HW control * Vaux3Regu = force off */ -INIT_REGULATOR_REGISTER (AB8500_VRF1VAUX3REGU ,0x08 ), +INIT_REGULATOR_REGISTER (AB8500_VRF1VAUX3REGU ,0x0f ,0x08 ),/* * Vsmps1 = 1.15V */ -INIT_REGULATOR_REGISTER (AB8500_VSMPS1SEL1 ,0x24 ), +INIT_REGULATOR_REGISTER (AB8500_VSMPS1SEL1 ,0x3f ,0x24 ),/* * Vaux1Sel = 2.5 V */ -INIT_REGULATOR_REGISTER (AB8500_VAUX1SEL ,0x08 ), +INIT_REGULATOR_REGISTER (AB8500_VAUX1SEL ,0x0f ,0x08 ),/* * Vaux2Sel = 2.9 V */ -INIT_REGULATOR_REGISTER (AB8500_VAUX2SEL ,0x0d ), +INIT_REGULATOR_REGISTER (AB8500_VAUX2SEL ,0x0f ,0x0d ),/* * Vaux3Sel = 2.91 V */ -INIT_REGULATOR_REGISTER (AB8500_VRF1VAUX3SEL ,0x07 ), +INIT_REGULATOR_REGISTER (AB8500_VRF1VAUX3SEL ,0x07 ,0x07 ),/* * VextSupply12LP = disabled (no LP) */ -INIT_REGULATOR_REGISTER (AB8500_REGUCTRL2SPARE ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUCTRL2SPARE ,0x01 ,0x00 ),/* * Vaux1Disch = short discharge time * Vaux2Disch = short discharge time
@@ -322,13 +322,13 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {* VTVoutDisch = short discharge time * VaudioDisch = short discharge time */ -INIT_REGULATOR_REGISTER (AB8500_REGUCTRLDISCH ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUCTRLDISCH ,0xfc ,0x00 ),/* * VanaDisch = short discharge time * VdmicPullDownEna = pulldown disabled when Vdmic is disabled * VdmicDisch = short discharge time */ - INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2, 0x16, 0x00), };/* AB8500 regulators */
drivers/regulator/ab8500.c +14 -22
@@ -812,23 +812,20 @@ static struct ab8500_reg_init ab8500_reg_init[] = { REG_INIT(AB8500_REGUCTRLDISCH2, 0x04, 0x44, 0x16), }; -static int -ab8500_regulator_init_registers (struct platform_device *pdev,int id,int value) +static int ab8500_regulator_init_registers (struct platform_device *pdev, +int id,int mask,int value) {int err; -if (value & ~ab8500_reg_init[id].mask) { -dev_err (&pdev->dev, -"Configuration error: value outside mask.\n" ); -return -EINVAL ; - } +BUG_ON (value & ~mask); +BUG_ON (mask & ~ab8500_reg_init[id].mask); +/* initialize register */ err =abx500_mask_and_set_register_interruptible ( &pdev->dev, ab8500_reg_init[id].bank, ab8500_reg_init[id].addr, - ab8500_reg_init[id].mask, - value); + mask, value);if (err <0 ) { dev_err(&pdev->dev, "Failed to initialize 0x%02x, 0x%02x.\n",
@@ -836,13 +833,11 @@ ab8500_regulator_init_registers(struct platform_device *pdev, int id, int value) ab8500_reg_init[id].addr);return err; } -dev_vdbg (&pdev->dev, -"init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" , - ab8500_reg_init[id].bank, - ab8500_reg_init[id].addr, - ab8500_reg_init[id].mask, - value); +" init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" , + ab8500_reg_init[id].bank, + ab8500_reg_init[id].addr, + mask, value);return 0 ; }
@@ -961,19 +956,16 @@ static int ab8500_regulator_probe(struct platform_device *pdev)/* initialize registers */ for (i =0 ; i < pdata->num_regulator_reg_init; i++) { -int id, value; +int id, mask, value; id = pdata->regulator_reg_init[i].id; + mask = pdata->regulator_reg_init[i].mask; value = pdata->regulator_reg_init[i].value;/* check for configuration errors */ -if (id >=AB8500_NUM_REGULATOR_REGISTERS ) { -dev_err (&pdev->dev, -"Configuration error: id outside range.\n" ); -return -EINVAL ; - } +BUG_ON (id >=AB8500_NUM_REGULATOR_REGISTERS ); - err =ab8500_regulator_init_registers (pdev, id, value); + err =ab8500_regulator_init_registers (pdev, id, mask, value);if (err <0 )return err; }
include/linux/regulator/ab8500.h +6 -4
@@ -48,13 +48,15 @@ enum ab9540_regulator_id {/* AB8500 and AB9540 register initialization */ struct ab8500_regulator_reg_init {int id; +u8 mask;u8 value; }; -#define INIT_REGULATOR_REGISTER (_id, _value) \ - { \ - .id = _id, \ - .value = _value, \ +#define INIT_REGULATOR_REGISTER (_id, _mask, _value) \ + { \ + .id = _id, \ + .mask = _mask, \ + .value = _value, \ }/* AB8500 registers */
Signature · 1 line
1.7.9.5
Re: [PATCH 05/49] ARM: ux500: regulators: Add mask for configuration
Quoted 7 lines · Lee Jones
There is already before a register mask in the regulator driver to allow some bits of a register to be initialized. The register value is defined in the board configuration. This patch puts a mask in the board configuration to specify which bits should actually be altered. The purpose with this patch is to avoid future mistakes when updating the allowed bits in the regulator driver.
This looks fine but I'll wait for Linus (plus I suspect it depends on patch 1). Stopped now due to this.
Re: [PATCH 05/49] ARM: ux500: regulators: Add mask for configuration
In reply to Lee JonesQuoted 9 lines · Lee Jones
There is already before a register mask in the regulator driver to allow some bits of a register to be initialized. The register value is defined in the board configuration. This patch puts a mask in the board configuration to specify which bits should actually be altered. The purpose with this patch is to avoid future mistakes when updating the allowed bits in the regulator driver.
Signed-off-by Lee Jones <[email protected]>
Yours,
Linus Walleij
PATCH 6/49 regulator: ab8500: Another push to synchronise recent AB8500 developments
In reply to Lee JonesThis patch ensures that many of the recent developments pertaining to the AB8500 regulator device are propagated out into the public arena. It aims to update some of the existing initialisation values in accordance with internal ST-Ericsson code submissions. This single patch was originally a collection of updates which have been squashed together to aid with clarity.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 18 ------ drivers/regulator/ab8500.c | 86 +++++++++++++++---------- include/linux/regulator/ab8500.h | 21 +++--- 3 files changed, 65 insertions(+), 60 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +0 -18
@@ -239,24 +239,6 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {*/ INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x03, 0x00),/* -* VBBN = force OFF -* VBBP = force OFF -* NOTE! PRCMU register -*/ -INIT_REGULATOR_REGISTER (AB8500_ARMREGU2 ,0x0f ,0x00 ), -/* -* VBBNSel1 = VBBP = VBBPFB -* VBBPSel1 = 0 V -* NOTE! PRCMU register -*/ -INIT_REGULATOR_REGISTER (AB8500_VBBSEL1 ,0x0f ,0x00 ), -/* -* VBBNSel2 = VBBP = VBBPFB -* VBBPSel2 = 0 V -* NOTE! PRCMU register -*/ -INIT_REGULATOR_REGISTER (AB8500_VBBSEL2 ,0x0f ,0x00 ), -/* * Vsmps1Regu = HW control * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 */
drivers/regulator/ab8500.c +53 -33
176 lines not on this page · raw message
include/linux/regulator/ab8500.h +12 -9
@@ -61,6 +61,7 @@ struct ab8500_regulator_reg_init {/* AB8500 registers */ enum ab8500_regulator_reg { +AB8500_REGUREQUESTCTRL1 ,AB8500_REGUREQUESTCTRL2 ,AB8500_REGUREQUESTCTRL3 ,AB8500_REGUREQUESTCTRL4 ,
@@ -77,26 +78,28 @@ enum ab8500_regulator_reg {AB8500_REGUMISC1 ,AB8500_VAUDIOSUPPLY ,AB8500_REGUCTRL1VAMIC , +AB8500_VSMPS1REGU , +AB8500_VSMPS2REGU , +AB8500_VSMPS3REGU ,/* NOTE! PRCMU register */ AB8500_VPLLVANAREGU ,AB8500_VREFDDR ,AB8500_EXTSUPPLYREGU ,AB8500_VAUX12REGU ,AB8500_VRF1VAUX3REGU , +AB8500_VSMPS1SEL1 , +AB8500_VSMPS1SEL2 , +AB8500_VSMPS1SEL3 , +AB8500_VSMPS2SEL1 , +AB8500_VSMPS2SEL2 , +AB8500_VSMPS2SEL3 , +AB8500_VSMPS3SEL1 ,/* NOTE! PRCMU register */ +AB8500_VSMPS3SEL2 ,/* NOTE! PRCMU register */ AB8500_VAUX1SEL ,AB8500_VAUX2SEL ,AB8500_VRF1VAUX3SEL ,AB8500_REGUCTRL2SPARE ,AB8500_REGUCTRLDISCH ,AB8500_REGUCTRLDISCH2 , -AB8500_ARMREGU2 ,/* NOTE! PRCMU register */ -AB8500_VBBSEL1 ,/* NOTE! PRCMU register */ -AB8500_VBBSEL2 ,/* NOTE! PRCMU register */ -AB8500_VSMPS1REGU , -AB8500_VSMPS2REGU , -AB8500_VSMPS3REGU ,/* NOTE! PRCMU register */ -AB8500_VSMPS1SEL1 , -AB8500_VSMPS3SEL1 ,/* NOTE! PRCMU register */ -AB8500_VSMPS3SEL2 ,/* NOTE! PRCMU register */ AB8500_NUM_REGULATOR_REGISTERS, };
Signature · 1 line
1.7.9.5
PATCH 7/49 regulator: ab8500: Separate regulator and MFD platform data
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
The ab8500 MFD should not have knowledge about regulator- specific platform data like number of regulators and regulator registers. As the regulator platform data is about to grow with external regulators, this information is moved to a new structure provided by the regulator driver.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 12 +++++++++--- arch/arm/mach-ux500/board-mop500-regulators.h | 4 +--- drivers/regulator/ab8500.c | 21 +++++++++++++++------ include/linux/regulator/ab8500.h | 7 +++++++ 4 files changed, 32 insertions(+), 12 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +9 -3
@@ -122,8 +122,7 @@ static struct regulator_consumer_supply ab8500_vana_consumers[] = { };/* ab8500 regulator register initialization */ -struct ab8500_regulator_reg_init -ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS ] = { +static struct ab8500_regulator_reg_init ab8500_reg_init[] = {/* * VanaRequestCtrl = HP/LP depending on VxRequest * VpllRequestCtrl = HP/LP depending on VxRequest
@@ -314,7 +313,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { };/* AB8500 regulators */ -struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS ] = { +static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS ] = {/* supplies to the display/camera */ [AB8500_LDO_AUX1 ] = { .constraints = {
@@ -423,3 +422,10 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { .consumer_supplies = ab8500_vana_consumers, }, }; + +struct ab8500_regulator_platform_data ab8500_regulator_plat_data = { + .reg_init = ab8500_reg_init, + .num_reg_init =ARRAY_SIZE (ab8500_reg_init), + .regulator = ab8500_regulators, + .num_regulator =ARRAY_SIZE (ab8500_regulators), +};
arch/arm/mach-ux500/board-mop500-regulators.h +1 -3
@@ -14,9 +14,7 @@#include <linux/regulator/machine.h> #include <linux/regulator/ab8500.h> -extern struct ab8500_regulator_reg_init -ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS ]; -extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS ]; +extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;extern struct regulator_init_data tps61052_regulator;extern struct regulator_init_data gpio_en_3v3_regulator;
drivers/regulator/ab8500.c +15 -6
@@ -940,8 +940,9 @@ ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)static int ab8500_regulator_probe (struct platform_device *pdev) {struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent); -struct ab8500_platform_data *pdata;struct device_node *np = pdev->dev.of_node; +struct ab8500_platform_data *ppdata; +struct ab8500_regulator_platform_data *pdata;int i, err;if (np) {
@@ -962,7 +963,14 @@ static int ab8500_regulator_probe(struct platform_device *pdev)dev_err (&pdev->dev,"null mfd parent\n" );return -EINVAL ; } - pdata =dev_get_platdata (ab8500->dev); + + ppdata =dev_get_platdata (ab8500->dev); +if (!ppdata) { +dev_err (&pdev->dev,"null parent pdata\n" ); +return -EINVAL ; + } + + pdata = ppdata->regulator;if (!pdata) {dev_err (&pdev->dev,"null pdata\n" );return -EINVAL ;
@@ -975,12 +983,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev) }/* initialize registers */ -for (i =0 ; i < pdata->num_regulator_reg_init; i++) { +for (i =0 ; i < pdata->num_reg_init; i++) {int id, mask, value; - id = pdata->regulator_reg_init[i].id; - mask = pdata->regulator_reg_init[i].mask; - value = pdata->regulator_reg_init[i].value; + id = pdata->reg_init[i].id; + mask = pdata->reg_init[i].mask; + value = pdata->reg_init[i].value;/* check for configuration errors */ BUG_ON (id >=AB8500_NUM_REGULATOR_REGISTERS );
@@ -1046,5 +1054,6 @@ module_exit(ab8500_regulator_exit);MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Sundar Iyer <[email protected]>" ); +MODULE_AUTHOR ("Bengt Jonsson <[email protected]>" );MODULE_DESCRIPTION ("Regulator Driver for ST-Ericsson AB8500 Mixed-Sig PMIC" );MODULE_ALIAS ("platform:ab8500-regulator" );
include/linux/regulator/ab8500.h +7 -0
@@ -152,4 +152,11 @@ enum ab9540_regulator_reg { AB9540_NUM_REGULATOR_REGISTERS, }; +struct ab8500_regulator_platform_data { +int num_reg_init; +struct ab8500_regulator_reg_init *reg_init; +int num_regulator; +struct regulator_init_data *regulator; +}; +#endif
Signature · 1 line
1.7.9.5
PATCH 8/49 regulator: ab8500: Add support of low voltage battery
In reply to Lee JonesLow voltage batteries have a wider voltage range with lower operating voltages. Some consumers in the platform may not work with the lower voltages and therefore need an extra regulator to boost the voltage in this case.
This driver adds support for checking the consumers that need higher voltage (Vaux1, 2 and 3 regulators, 3 V SIM) and control the external buck/boost regulator accordingly.
Note that to utilize the low voltage battery support, the battery voltage thresholds must be changed. This applies for the low battery voltage threshold of the battery manager and the OTP setting for the AB8500 BattOk levels.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 125 +++++++- arch/arm/mach-ux500/board-mop500-regulators.h | 2 + drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/ab8500-ext.c | 391 +++++++++++++++++++++++++ drivers/regulator/ab8500.c | 12 +- include/linux/regulator/ab8500.h | 26 ++ 7 files changed, 560 insertions(+), 5 deletions(-) create mode 100644 drivers/regulator/ab8500-ext.c
arch/arm/mach-ux500/board-mop500-regulators.c +121 -4
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/regulator/machine.h> #include <linux/regulator/ab8500.h> +#include <mach/id.h> /* to identify older boards for fixes */ #include "board-mop500-regulators.h" static struct regulator_consumer_supply gpio_en_3v3_consumers[] = {
@@ -258,13 +259,13 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = {*/ INIT_REGULATOR_REGISTER (AB8500_VREFDDR ,0x03 ,0x00 ),/* -* VextSupply1Regu = HW control -* VextSupply2Regu = HW control -* VextSupply3Regu = HW control +* VextSupply1Regu = force LP +* VextSupply2Regu = force OFF +* VextSupply3Regu = force HP (-> STBB2=LP and TPS=LP) * ExtSupply2Bypass = ExtSupply12LPn ball is 0 when Ena is 0 * ExtSupply3Bypass = ExtSupply3LPn ball is 0 when Ena is 0 */ - INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0xff, 0x1a), + INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0xff, 0x13),/* * Vaux1Regu = force HP * Vaux2Regu = force off
@@ -316,6 +317,7 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = {static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS ] = {/* supplies to the display/camera */ [AB8500_LDO_AUX1 ] = { + .supply_regulator ="ab8500-ext-supply3" , .constraints = { .name ="V-DISPLAY" , .min_uV =2500000 ,
@@ -336,6 +338,7 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, /* supplies to the on-board eMMC */ [AB8500_LDO_AUX2] = { + .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-eMMC1", .min_uV = 1100000,
@@ -348,6 +351,7 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, /* supply for VAUX3, supplies to SDcard slots */ [AB8500_LDO_AUX3] = { + .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-MMC-SD", .min_uV = 1100000,
@@ -423,9 +427,122 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, }; +/* supply for VextSupply3 */ +static struct regulator_consumer_supply ab8500_ext_supply3_consumers[] = { +/* SIM supply for 3 V SIM cards */ +REGULATOR_SUPPLY ("vinvsim" ,"sim-detect.0" ), +}; + +/* extended configuration for VextSupply2, only used for HREFP_V20 boards */ +static struct ab8500_ext_regulator_cfg ab8500_ext_supply2 = { + .hwreq = true, +}; + +/* +* AB8500 external regulators +*/ +static struct regulator_init_data ab8500_ext_regulators[] = { +/* fixed Vbat supplies VSMPS1_EXT_1V8 */ + [AB8500_EXT_SUPPLY1 ] = { + .constraints = { + .name ="ab8500-ext-supply1" , + .min_uV =1800000 , + .max_uV =1800000 , + .initial_mode =REGULATOR_MODE_IDLE , + .boot_on =1 , + .always_on =1 , + }, + }, +/* fixed Vbat supplies VSMPS2_EXT_1V36 and VSMPS5_EXT_1V15 */ + [AB8500_EXT_SUPPLY2 ] = { + .constraints = { + .name ="ab8500-ext-supply2" , + .min_uV =1360000 , + .max_uV =1360000 , + }, + }, +/* fixed Vbat supplies VSMPS3_EXT_3V4 and VSMPS4_EXT_3V4 */ + [AB8500_EXT_SUPPLY3 ] = { + .constraints = { + .name ="ab8500-ext-supply3" , + .min_uV =3400000 , + .max_uV =3400000 , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + .boot_on =1 , + }, + .num_consumer_supplies = +ARRAY_SIZE (ab8500_ext_supply3_consumers), + .consumer_supplies = ab8500_ext_supply3_consumers, + }, +}; +struct ab8500_regulator_platform_data ab8500_regulator_plat_data = { .reg_init = ab8500_reg_init, .num_reg_init =ARRAY_SIZE (ab8500_reg_init), .regulator = ab8500_regulators, .num_regulator =ARRAY_SIZE (ab8500_regulators), + .ext_regulator = ab8500_ext_regulators, + .num_ext_regulator =ARRAY_SIZE (ab8500_ext_regulators), }; + +static void ab8500_modify_reg_init (int id,u8 mask,u8 value) +{ +int i; + +for (i =ARRAY_SIZE (ab8500_reg_init) -1 ; i >=0 ; i--) { +if (ab8500_reg_init[i].id == id) { +u8 initval = ab8500_reg_init[i].value; + initval = (initval & ~mask) | (value & mask); + ab8500_reg_init[i].value = initval; + +BUG_ON (mask & ~ab8500_reg_init[i].mask); +return ; + } + } + +BUG_ON (1 ); +} + +void mop500_regulator_init (void ) +{ +struct regulator_init_data *regulator; + +/* +* Handle VextSupply1 on older boards than HREFP_V22_V1x +* (turn off in suspend) +*/ +if (cpu_is_u8500v20 () ||cpu_is_u8500v21 ()) { +/* disable VextSupply1 in suspend */ + regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY1 ]; + regulator->constraints.state_mem.disabled =1 ; + regulator->constraints.state_standby.disabled =1 ; + } + +/* +* Handle AB8500_EXT_SUPPLY2 on HREFP_V20_V50 boards (do it for +* all HREFP_V20 boards) +*/ +if (cpu_is_u8500v20 ()) { +/* VextSupply2RequestCtrl = HP/OFF depending on VxRequest */ +ab8500_modify_reg_init (AB8500_REGUREQUESTCTRL3 ,0x01 ,0x01 ); + +/* VextSupply2SysClkReq1HPValid = SysClkReq1 controlled */ +ab8500_modify_reg_init (AB8500_REGUSYSCLKREQ1HPVALID2 , +0x20 ,0x20 ); + +/* VextSupply2 = force HP at initialization */ +ab8500_modify_reg_init (AB8500_EXTSUPPLYREGU ,0x0c ,0x04 ); + +/* enable VextSupply2 during platform active */ + regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY2 ]; + regulator->constraints.always_on =1 ; + +/* disable VextSupply2 in suspend */ + regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY2 ]; + regulator->constraints.state_mem.disabled =1 ; + regulator->constraints.state_standby.disabled =1 ; + +/* enable VextSupply2 HW control (used in suspend) */ + regulator->driver_data = (void *)&ab8500_ext_supply2; + } +}
arch/arm/mach-ux500/board-mop500-regulators.h +2 -0
@@ -18,4 +18,6 @@ extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;extern struct regulator_init_data tps61052_regulator;extern struct regulator_init_data gpio_en_3v3_regulator; +void mop500_regulator_init (void ); +#endif
drivers/regulator/Kconfig +8 -0
@@ -332,6 +332,14 @@ config REGULATOR_AB8500 This driver supports the regulators found on the ST-Ericsson mixed signal AB8500 PMIC +config REGULATOR_AB8500_EXT + bool "ST-Ericsson AB8500 External Regulators" + depends on REGULATOR_AB8500 + default y if REGULATOR_AB8500 + help + This driver supports the external regulator controls found on the + ST-Ericsson mixed signal AB8500 PMIC + config REGULATOR_DBX500_PRCMU bool
drivers/regulator/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o +obj-$(CONFIG_REGULATOR_AB8500_EXT) += ab8500-ext.o obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
drivers/regulator/ab8500-ext.c new file +391 -0
391 lines not on this page · raw message
drivers/regulator/ab8500.c +11 -1
@@ -998,6 +998,11 @@ static int ab8500_regulator_probe(struct platform_device *pdev)return err; } +/* register external regulators (before Vaux1, 2 and 3) */ + err =ab8500_ext_regulator_init (pdev); +if (err) +return err; +/* register all regulators */ for (i =0 ; i <ARRAY_SIZE (ab8500_regulator_info); i++) { err =ab8500_regulator_register (pdev, &pdata->regulator[i], i,NULL );
@@ -1010,7 +1015,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev)static int ab8500_regulator_remove (struct platform_device *pdev) { -int i; +int i, err;for (i =0 ; i <ARRAY_SIZE (ab8500_regulator_info); i++) {struct ab8500_regulator_info *info =NULL ;
@@ -1022,6 +1027,11 @@ static int ab8500_regulator_remove(struct platform_device *pdev)regulator_unregister (info->regulator); } +/* remove external regulators (after Vaux1, 2 and 3) */ + err =ab8500_ext_regulator_exit (pdev); +if (err) +return err; +return 0 ; }
include/linux/regulator/ab8500.h +26 -0
@@ -10,6 +10,8 @@#ifndef __LINUX_MFD_AB8500_REGULATOR_H#define __LINUX_MFD_AB8500_REGULATOR_H +#include <linux/platform_device.h> +/* AB8500 regulators */ enum ab8500_regulator_id { AB8500_LDO_AUX1,
@@ -152,11 +154,35 @@ enum ab9540_regulator_reg { AB9540_NUM_REGULATOR_REGISTERS, }; +/* AB8500 external regulators */ +enum ab8500_ext_regulator_id { +AB8500_EXT_SUPPLY1 , +AB8500_EXT_SUPPLY2 , +AB8500_EXT_SUPPLY3 , +AB8500_NUM_EXT_REGULATORS , +}; +struct ab8500_regulator_platform_data {int num_reg_init;struct ab8500_regulator_reg_init *reg_init;int num_regulator;struct regulator_init_data *regulator; +int num_ext_regulator; +struct regulator_init_data *ext_regulator; }; +#ifdef CONFIG_REGULATOR_AB8500_EXT +int ab8500_ext_regulator_init (struct platform_device *pdev); +int ab8500_ext_regulator_exit (struct platform_device *pdev); +#else +inline int ab8500_ext_regulator_init (struct platform_device *pdev) +{ +return 0 ; +} +inline int ab8500_ext_regulator_exit (struct platform_device *pdev) +{ +return 0 ; +} +#endif +#endif
Signature · 1 line
1.7.9.5
PATCH 9/49 ARM: ux500: Update displays in vaux1 consumer list
In reply to Lee JonesAdd 3 more specific consumers pertaining to the displays found on the u8500 and ST User Interface Boards (UIBs).
--- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +6 -2
@@ -54,8 +54,12 @@ struct regulator_init_data tps61052_regulator = { };static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { -/* External displays, connector on board 2v5 power supply */ -REGULATOR_SUPPLY ("vaux12v5" ,"mcde.0" ), +/* Main display, u8500 R3 uib */ +REGULATOR_SUPPLY ("vddi" ,"mcde_disp_sony_acx424akp.0" ), +/* Main display, u8500 uib and ST uib */ +REGULATOR_SUPPLY ("vdd1" ,"samsung_s6d16d0.0" ), +/* Secondary display, ST uib */ +REGULATOR_SUPPLY ("vdd1" ,"samsung_s6d16d0.1" ),/* SFH7741 proximity sensor */ REGULATOR_SUPPLY ("vcc" ,"gpio-keys.0" ),/* BH1780GLS ambient light sensor */
Signature · 1 line
1.7.9.5
Re: [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list
Quoted 4 lines · Lee Jones
Add 3 more specific consumers pertaining to the displays found on the u8500 and ST User Interface Boards (UIBs).
Signed-off-by Lee Jones <[email protected]>
This look correct,
Do you want me to merge the ux500 portions into the ux500 maintenance tree?
Yours,
Linus Walleij
Re: [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list
Quoted 5 lines · Linus Walleij
Quoted 2 lines · Lee Jones
Add 3 more specific consumers pertaining to the displays found on the u8500 and ST User Interface Boards (UIBs).
Quoted 7 lines
Quoted 1 line
Signed-off-by Lee Jones <[email protected]>This look correct,
Acked-by Linus Walleij <[email protected]>Do you want me to merge the ux500 portions into the ux500 maintenance tree?
Lee indicated that splitting them up from the regulator changes causes bisection issues.
Re: [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list
Quoted 8 lines · Mark Brown
Quoted 6 lines · Linus Walleij
Quoted 4 lines · Lee Jones
Add 3 more specific consumers pertaining to the displays found on the u8500 and ST User Interface Boards (UIBs).
Signed-off-by Lee Jones <[email protected]>
Quoted 8 lines
Quoted 5 lines
This look correct,
Acked-by Linus Walleij <[email protected]>Do you want me to merge the ux500 portions into the ux500 maintenance tree?
Lee indicated that splitting them up from the regulator changes causes bisection issues.
Right.
Ideally just Acks would be really good Linus.
Would you be happy with that?
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list
Quoted 5 lines · Lee Jones
Quoted 4 lines · Mark Brown
[Me]
Quoted 2 lines
Do you want me to merge the ux500 portions into the ux500 maintenance tree?
Quoted 8 lines
Quoted 2 lines
Lee indicated that splitting them up from the regulator changes causes bisection issues.
Right.
Ideally just Acks would be really good Linus.
Would you be happy with that?
Sure thing. Forget anything I said... I've sent
ACKs for the stuff I like.
Yours,
Linus Walleij
PATCH 10/49 regulator: ab8500-ext: Cosmetic changes
In reply to Lee JonesVariable is renamed in driver. Some comments are added.
--- drivers/regulator/ab8500-ext.c | 22 +++++++++++----------- include/linux/regulator/ab8500.h | 2 ++ 2 files changed, 13 insertions(+), 11 deletions(-)
drivers/regulator/ab8500-ext.c +11 -11
@@ -27,7 +27,7 @@* struct ab8500_ext_regulator_info - ab8500 regulator information * @dev: device pointer * @desc: regulator description -* @regulator_dev: regulator device +* @rdev: regulator device * @is_enabled: status of regulator (on/off) * @fixed_uV: typical voltage (for fixed voltage supplies) * @update_bank: bank to control on/off
@@ -43,7 +43,7 @@struct ab8500_ext_regulator_info {struct device *dev;struct regulator_desc desc; -struct regulator_dev *regulator; +struct regulator_dev *rdev;bool is_enabled;int fixed_uV;u8 update_bank;
@@ -68,7 +68,7 @@ static int ab8500_ext_regulator_enable(struct regulator_dev *rdev) info->update_bank, info->update_reg, info->update_mask, info->update_val);if (ret <0 ) -dev_err (rdev_get_dev (rdev), +dev_err (rdev_get_dev (info->rdev),"couldn't set enable bits for regulator\n" ); info->is_enabled = true;
@@ -95,7 +95,7 @@ static int ab8500_ext_regulator_disable(struct regulator_dev *rdev) info->update_bank, info->update_reg, info->update_mask, 0x0);if (ret <0 ) -dev_err (rdev_get_dev (rdev), +dev_err (rdev_get_dev (info->rdev),"couldn't set disable bits for regulator\n" ); info->is_enabled = false;
@@ -347,21 +347,21 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) info->dev = &pdev->dev;/* register regulator with framework */ - info->regulator =regulator_register (&info->desc, &pdev->dev, + info->rdev =regulator_register (&info->desc, &pdev->dev, &pdata->ext_regulator[i], info,NULL ); -if (IS_ERR (info->regulator)) { - err =PTR_ERR (info->regulator); +if (IS_ERR (info->rdev)) { + err =PTR_ERR (info->rdev);dev_err (&pdev->dev,"failed to register regulator %s\n" , info->desc.name);/* when we fail, un-register all earlier regulators */ while (--i >=0 ) { info = &ab8500_ext_regulator_info[i]; -regulator_unregister (info->regulator); +regulator_unregister (info->rdev); }return err; } -dev_dbg (rdev_get_dev (info->regulator), +dev_dbg (rdev_get_dev (info->rdev),"%s-probed\n" , info->desc.name); }
@@ -376,10 +376,10 @@ int ab8500_ext_regulator_exit(struct platform_device *pdev)struct ab8500_ext_regulator_info *info =NULL ; info = &ab8500_ext_regulator_info[i]; -dev_vdbg (rdev_get_dev (info->regulator), +dev_vdbg (rdev_get_dev (info->rdev),"%s-remove\n" , info->desc.name); -regulator_unregister (info->regulator); +regulator_unregister (info->rdev); }return 0 ;
include/linux/regulator/ab8500.h +2 -0
@@ -162,6 +162,7 @@ enum ab8500_ext_regulator_id { AB8500_NUM_EXT_REGULATORS, }; +/* AB8500 regulator platform data */ struct ab8500_regulator_platform_data {int num_reg_init;struct ab8500_regulator_reg_init *reg_init;
@@ -171,6 +172,7 @@ struct ab8500_regulator_platform_data {struct regulator_init_data *ext_regulator; }; +/* AB8500 external regulator functions (internal) */ #ifdef CONFIG_REGULATOR_AB8500_EXT int ab8500_ext_regulator_init (struct platform_device *pdev);int ab8500_ext_regulator_exit (struct platform_device *pdev);
Signature · 1 line
1.7.9.5
PATCH 11/49 regulator: ab8500-ext: Add HW request support
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
Support for HW request is added in the external regulator driver. A flag in the board configuration can be set to let HW control the regulator when there is no SW request. This means that the regulator will be put in high power mode when there is a SW request and in HW-request mode otherwise.
--- drivers/regulator/ab8500-ext.c | 98 +++++++++++++++++++++++++++----------- include/linux/regulator/ab8500.h | 4 ++ 2 files changed, 75 insertions(+), 27 deletions(-)
drivers/regulator/ab8500-ext.c +71 -27
@@ -28,82 +28,123 @@* @dev: device pointer * @desc: regulator description * @rdev: regulator device +* @cfg: regulator configuration (extension of regulator FW configuration) * @is_enabled: status of regulator (on/off) * @fixed_uV: typical voltage (for fixed voltage supplies) * @update_bank: bank to control on/off * @update_reg: register to control on/off * @update_mask: mask to enable/disable and set mode of regulator * @update_val: bits holding the regulator current mode -* @update_val_en: bits to set EN pin active (LPn pin deactive) +* @update_val_hp: bits to set EN pin active (LPn pin deactive) * normally this means high power mode -* @update_val_en_lp: bits to set EN pin active and LPn pin active -* normally this means low power mode -* @delay: startup delay in ms +* @update_val_lp: bits to set EN pin active and LPn pin active +* normally this means low power mode +* @update_val_hw: bits to set regulator pins in HW control +* SysClkReq pins and logic will choose mode */ struct ab8500_ext_regulator_info {struct device *dev;struct regulator_desc desc;struct regulator_dev *rdev; +struct ab8500_ext_regulator_cfg *cfg;bool is_enabled;int fixed_uV;u8 update_bank;u8 update_reg;u8 update_mask;u8 update_val; -u8 update_val_en; -u8 update_val_en_lp; +u8 update_val_hp; +u8 update_val_lp; +u8 update_val_hw; }; -static int ab8500_ext_regulator_enable (struct regulator_dev *rdev) +static int enable (struct ab8500_ext_regulator_info *info,u8 *regval) {int ret; -struct ab8500_ext_regulator_info *info =rdev_get_drvdata (rdev); -if (info ==NULL ) { -dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); -return -EINVAL ; - } + *regval = info->update_val; + +/* +* To satisfy both HW high power request and SW request, the regulator +* must be on in high power. +*/ +if (info->cfg && info->cfg->hwreq) + *regval = info->update_val_hp; ret =abx500_mask_and_set_register_interruptible (info->dev, info->update_bank, info->update_reg, - info->update_mask, info->update_val); + info->update_mask, *regval);if (ret <0 )dev_err (rdev_get_dev (info->rdev),"couldn't set enable bits for regulator\n" ); info->is_enabled = true; -dev_dbg (rdev_get_dev (rdev),"%s-enable (bank, reg, mask, value):" -" 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" , - info->desc.name, info->update_bank, info->update_reg, - info->update_mask, info->update_val); -return ret; } -static int ab8500_ext_regulator_disable (struct regulator_dev *rdev) +static int ab8500_ext_regulator_enable (struct regulator_dev *rdev) {int ret;struct ab8500_ext_regulator_info *info =rdev_get_drvdata (rdev); +u8 regval;if (info ==NULL ) {dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" );return -EINVAL ; } + ret =enable (info, ®val); + +dev_dbg (rdev_get_dev (rdev),"%s-enable (bank, reg, mask, value):" +" 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" , + info->desc.name, info->update_bank, info->update_reg, + info->update_mask, regval); + +return ret; +} + +static int disable (struct ab8500_ext_regulator_info *info,u8 *regval) +{ +int ret; + + *regval =0x0 ; + +/* +* Set the regulator in HW request mode if configured +*/ +if (info->cfg && info->cfg->hwreq) + *regval = info->update_val_hw; + ret =abx500_mask_and_set_register_interruptible (info->dev, info->update_bank, info->update_reg, - info->update_mask,0x0 ); + info->update_mask, *regval);if (ret <0 )dev_err (rdev_get_dev (info->rdev),"couldn't set disable bits for regulator\n" ); info->is_enabled = false; +return ret; +} + +static int ab8500_ext_regulator_disable (struct regulator_dev *rdev) +{ +int ret; +struct ab8500_ext_regulator_info *info =rdev_get_drvdata (rdev); +u8 regval; + +if (info ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +return -EINVAL ; + } + + ret =disable (info, ®val); +dev_dbg (rdev_get_dev (rdev),"%s-disable (bank, reg, mask, value):" " 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" , info->desc.name, info->update_bank, info->update_reg, - info->update_mask,0x0 ); + info->update_mask, regval);return ret; }
@@ -132,7 +173,8 @@ static int ab8500_ext_regulator_is_enabled(struct regulator_dev *rdev) info->desc.name, info->update_bank, info->update_reg, info->update_mask, regval); -if (regval & info->update_mask) +if (((regval & info->update_mask) == info->update_val_lp) || + ((regval & info->update_mask) == info->update_val_hp)) info->is_enabled = true;else info->is_enabled = false;
@@ -240,7 +282,6 @@ static struct regulator_ops ab8500_ext_regulator_ops = { .list_voltage = ab8500_ext_list_voltage, }; -static struct ab8500_ext_regulator_info ab8500_ext_regulator_info[AB8500_NUM_EXT_REGULATORS ] = { [AB8500_EXT_SUPPLY1 ] = {
@@ -293,8 +334,9 @@ static struct ab8500_ext_regulator_info .update_reg = 0x08, .update_mask = 0x30, .update_val = 0x10, - .update_val_en = 0x10, - .update_val_en_lp = 0x30, + .update_val_hp = 0x10, + .update_val_lp = 0x30, + .update_val_hw = 0x20, }, };
@@ -334,8 +376,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)/* VextSupply3LPn is inverted on AB8500 2.x */ info = &ab8500_ext_regulator_info[AB8500_EXT_SUPPLY3 ]; info->update_val =0x30 ; - info->update_val_en =0x30 ; - info->update_val_en_lp =0x10 ; + info->update_val_hp =0x30 ; + info->update_val_lp =0x10 ; }/* register all regulators */
@@ -345,6 +387,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)/* assign per-regulator data */ info = &ab8500_ext_regulator_info[i]; info->dev = &pdev->dev; + info->cfg = (struct ab8500_ext_regulator_cfg *) + pdata->ext_regulator[i].driver_data;/* register regulator with framework */ info->rdev = regulator_register(&info->desc, &pdev->dev,
include/linux/regulator/ab8500.h +4 -0
@@ -155,6 +155,10 @@ enum ab9540_regulator_reg { };/* AB8500 external regulators */ +struct ab8500_ext_regulator_cfg { +bool hwreq;/* requires hw mode or high power mode */ +}; +enum ab8500_ext_regulator_id {AB8500_EXT_SUPPLY1 ,AB8500_EXT_SUPPLY2 ,
Signature · 1 line
1.7.9.5
PATCH 12/49 regulator: ab8500-ext: Add suspend support
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
Operations regulator_suspend_enable and regulator_suspend_disable are added.
--- drivers/regulator/ab8500-ext.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/regulator/ab8500-ext.c +16 -0
@@ -104,6 +104,13 @@ static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)return ret; } +static int ab8500_ext_regulator_set_suspend_enable (struct regulator_dev *rdev) +{ +dev_dbg (rdev_get_dev (rdev),"suspend: " ); + +return ab8500_ext_regulator_enable (rdev); +} +static int disable (struct ab8500_ext_regulator_info *info,u8 *regval) {int ret;
@@ -149,6 +156,13 @@ static int ab8500_ext_regulator_disable(struct regulator_dev *rdev)return ret; } +static int ab8500_ext_regulator_set_suspend_disable (struct regulator_dev *rdev) +{ +dev_dbg (rdev_get_dev (rdev),"suspend: " ); + +return ab8500_ext_regulator_disable (rdev); +} +static int ab8500_ext_regulator_is_enabled (struct regulator_dev *rdev) {int ret;
@@ -274,7 +288,9 @@ static int ab8500_ext_list_voltage(struct regulator_dev *rdev,static struct regulator_ops ab8500_ext_regulator_ops = { .enable = ab8500_ext_regulator_enable, + .set_suspend_enable = ab8500_ext_regulator_set_suspend_enable, .disable = ab8500_ext_regulator_disable, + .set_suspend_disable = ab8500_ext_regulator_set_suspend_disable, .is_enabled = ab8500_ext_regulator_is_enabled, .set_mode = ab8500_ext_regulator_set_mode, .get_mode = ab8500_ext_regulator_get_mode,
Signature · 1 line
1.7.9.5
PATCH 13/49 regulator: ab8500: Remove USB regulator
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
The USB regulator is controlled by hardware. The software support was only needed for early hardware (ED) which is no longer supported.
--- drivers/regulator/ab8500.c | 20 -------------------- include/linux/regulator/ab8500.h | 1 - 2 files changed, 21 deletions(-)
drivers/regulator/ab8500.c +0 -20
@@ -494,25 +494,6 @@ static struct ab8500_regulator_info .update_val_idle = 0x82, .update_val_normal = 0x02, }, - [AB8500_LDO_USB] = { - .desc = { - .name = "LDO-USB", - .ops = &ab8500_regulator_fixed_ops, - .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_USB, - .owner = THIS_MODULE, - .n_voltages = 1, - .min_uV = 3300000, - }, - .update_bank = 0x03, - .update_reg = 0x82, - .update_mask = 0x03, - .update_val_enable = 0x01, - }, - -/* -* Regulators with fixed voltage and normal mode -*/ [AB8500_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO",
@@ -913,7 +894,6 @@ static struct of_regulator_match ab8500_regulator_matches[] = { { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, }, { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, }, { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, - { .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
include/linux/regulator/ab8500.h +0 -1
@@ -19,7 +19,6 @@ enum ab8500_regulator_id {AB8500_LDO_AUX3 ,AB8500_LDO_INTCORE ,AB8500_LDO_TVOUT , -AB8500_LDO_USB ,AB8500_LDO_AUDIO ,AB8500_LDO_ANAMIC1 , AB8500_LDO_ANAMIC2,
Signature · 1 line
1.7.9.5
PATCH 14/49 regulator: ab8500: Init debug from regulator driver
In reply to Lee JonesThe purpose of this patch is to guarantee that ab8500-debug will record the regulator registers before they are modified by the ab8500 regulator driver.
--- drivers/regulator/ab8500.c | 10 ++++++++++ include/linux/regulator/ab8500.h | 14 ++++++++++++++ 2 files changed, 24 insertions(+)
drivers/regulator/ab8500.c +10 -0
@@ -962,6 +962,11 @@ static int ab8500_regulator_probe(struct platform_device *pdev)return -EINVAL ; } +/* initialize debug (initial state is recorded with this call) */ + err =ab8500_regulator_debug_init (pdev); +if (err) +return err; +/* initialize registers */ for (i =0 ; i < pdata->num_reg_init; i++) {int id, mask, value;
@@ -1012,6 +1017,11 @@ static int ab8500_regulator_remove(struct platform_device *pdev)if (err)return err; +/* remove regulator debug */ + err =ab8500_regulator_debug_exit (pdev); +if (err) +return err; +return 0 ; }
include/linux/regulator/ab8500.h +14 -0
@@ -190,4 +190,18 @@ inline int ab8500_ext_regulator_exit(struct platform_device *pdev) }#endif +#ifdef CONFIG_REGULATOR_AB8500_DEBUG +int ab8500_regulator_debug_init (struct platform_device *pdev); +int ab8500_regulator_debug_exit (struct platform_device *pdev); +#else +static inline int ab8500_regulator_debug_init (struct platform_device *pdev) +{ +return 0 ; +} +static inline int ab8500_regulator_debug_exit (struct platform_device *pdev) +{ +return 0 ; +} +#endif +#endif
Signature · 1 line
1.7.9.5
PATCH 15/49 ARM: ux500: Add supply for the L3G4200D Gyroscope
In reply to Lee JonesThis patch lists the L3G4200D Gyroscope as a consumer of the AB8500 VAUX1 regulator.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/board-mop500-regulators.c +2 -0
@@ -73,6 +73,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("avdd" ,"3-005d" ),/* Synaptics RMI4 Touchscreen device */ REGULATOR_SUPPLY ("vdd" ,"3-004b" ), +/* L3G4200D Gyroscope device */ + REGULATOR_SUPPLY("vdd", "l3g4200d"), }; static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 15/49] ARM: ux500: Add supply for the L3G4200D Gyroscope
Quoted 13 lines · Lee Jones
This patch lists the L3G4200D Gyroscope as a consumer of the AB8500 VAUX1 regulator.
Signed-off-by Lee Jones <[email protected]>--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)arch/arm/mach-ux500/board-mop500-regulators.c +0
-0
arch/arm/mach-ux500/board-mop500-regulators.c static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { · line 77
Quoted 5 lines
arch/arm/mach-ux500/board-mop500-regulators.c +2
-0@@ -73,6 +73,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("avdd" ,"3-005d" ),/* Synaptics RMI4 Touchscreen device */ REGULATOR_SUPPLY ("vdd" ,"3-004b" ), +/* L3G4200D Gyroscope device */ + REGULATOR_SUPPLY("vdd", "l3g4200d"),
Hmmm isn't this an I2C device? Better check with Srinidhi about that device name.
Yours,
Linus Walleij
Re: [PATCH 15/49] ARM: ux500: Add supply for the L3G4200D Gyroscope
Quoted 10 lines · Linus Walleij
Quoted 8 lines · Lee Jones
This patch lists the L3G4200D Gyroscope as a consumer of the AB8500 VAUX1 regulator.
Signed-off-by Lee Jones <[email protected]>--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
Quoted 13 lines
arch/arm/mach-ux500/board-mop500-regulators.c static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { · line 77
Quoted 10 lines
arch/arm/mach-ux500/board-mop500-regulators.c +2
-0@@ -73,6 +73,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("avdd" ,"3-005d" ),/* Synaptics RMI4 Touchscreen device */ REGULATOR_SUPPLY ("vdd" ,"3-004b" ), +/* L3G4200D Gyroscope device */ + REGULATOR_SUPPLY("vdd", "l3g4200d"),Hmmm isn't this an I2C device? Better check with Srinidhi about that device name.
Yes, it is. If you want to maintain consistency in the above table, it should be rather..
REGULATOR_SUPPLY("vdd", "2-0068")
srinidhi
Quoted 3 lines
Yours,
Linus Walleij
PATCH 16/49 ARM: ux500: Add supply for the Proximity and Hal sensor
In reply to Lee JonesThis patch lists the Proximity and Hal sensors as a consumer of the AB8500 VAUX1 regulator.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/board-mop500-regulators.c +2 -0
@@ -75,6 +75,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("vdd" ,"3-004b" ),/* L3G4200D Gyroscope device */ REGULATOR_SUPPLY ("vdd" ,"l3g4200d" ), +/* Proximity and Hal sensor device */ + REGULATOR_SUPPLY("vdd", "sensor1p.0"), }; static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 16/49] ARM: ux500: Add supply for the Proximity and Hal sensor
Quoted 4 lines · Lee Jones
This patch lists the Proximity and Hal sensors as a consumer of the AB8500 VAUX1 regulator.
Signed-off-by Lee Jones <[email protected]>
Yours,
Linus Walleij
PATCH 17/49 ARM: ux500: Add supply for the Ambient light sensor device
In reply to Lee JonesThis patch lists the Ambient light sensor device as a consumer of the AB8500 VAUX1 regulator.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/board-mop500-regulators.c +2 -0
@@ -77,6 +77,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("vdd" ,"l3g4200d" ),/* Proximity and Hal sensor device */ REGULATOR_SUPPLY ("vdd" ,"sensor1p.0" ), +/* Ambient light sensor device */ + REGULATOR_SUPPLY("vdd", "3-0029"), }; static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 17/49] ARM: ux500: Add supply for the Ambient light sensor device
Quoted 4 lines · Lee Jones
This patch lists the Ambient light sensor device as a consumer of the AB8500 VAUX1 regulator.
Signed-off-by Lee Jones <[email protected]>
Yours,
Linus Walleij
PATCH 18/49 ARM: ux500: Add supply for the Pressure sensor
In reply to Lee JonesThis patch lists the Pressure sensor as a consumer of the AB8500 VAUX1 regulator.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/board-mop500-regulators.c +2 -0
@@ -79,6 +79,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("vdd" ,"sensor1p.0" ),/* Ambient light sensor device */ REGULATOR_SUPPLY ("vdd" ,"3-0029" ), +/* Pressure sensor device */ + REGULATOR_SUPPLY("vdd", "2-005c"), }; static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 18/49] ARM: ux500: Add supply for the Pressure sensor
Quoted 4 lines · Lee Jones
This patch lists the Pressure sensor as a consumer of the AB8500 VAUX1 regulator.
Signed-off-by Lee Jones <[email protected]>
Yours,
Linus Walleij
PATCH 19/49 ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen
In reply to Lee JonesThis patch lists the Cypress TrueTouch Touchscreen as a consumer of the AB8500 VAUX1 regulator.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/board-mop500-regulators.c +2 -0
@@ -81,6 +81,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("vdd" ,"3-0029" ),/* Pressure sensor device */ REGULATOR_SUPPLY ("vdd" ,"2-005c" ), +/* Cypress TrueTouch Touchscreen device */ + REGULATOR_SUPPLY("vcpin", "spi8.0"), }; static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 19/49] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen
Quoted 4 lines · Lee Jones
This patch lists the Cypress TrueTouch Touchscreen as a consumer of the AB8500 VAUX1 regulator.
Signed-off-by Lee Jones <[email protected]>
Yours,
Linus Walleij
PATCH 20/49 ARM: ux500: regulators: List the MMIO camera as a consumer of VAUX1
In reply to Lee JonesThe MMIO camera uses the VAUX1 as it's voltage supply.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/board-mop500-regulators.c +2 -0
@@ -83,6 +83,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("vdd" ,"2-005c" ),/* Cypress TrueTouch Touchscreen device */ REGULATOR_SUPPLY ("vcpin" ,"spi8.0" ), +/* Camera device */ + REGULATOR_SUPPLY("vaux12v5", "mmio_camera"), }; static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 20/49] ARM: ux500: regulators: List the MMIO camera as a consumer of VAUX1
Quoted 3 lines · Lee Jones
The MMIO camera uses the VAUX1 as it's voltage supply.
Signed-off-by Lee Jones <[email protected]>
Yours,
Linus Walleij
PATCH 21/49 regulator: ab8500: Clean out SoC registers
In reply to Lee JonesClean out initialisation that is handled by SoC. Regulator settings for Vpll (partly), Vsmps1, Vsmps2, Vsmps3 (partly), Vrf1, Varm, Vape, Vbb, Vmod are cleaned out. They should not be touched by the kernel.
We also update many of the initialisation values to be more in-line with the current development efforts of ST-Ericsson internal engineers.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 28 +------ drivers/regulator/ab8500.c | 98 ++++++------------------- include/linux/regulator/ab8500.h | 12 --- 3 files changed, 28 insertions(+), 110 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +4 -24
@@ -142,10 +142,9 @@ static struct regulator_consumer_supply ab8500_vana_consumers[] = {static struct ab8500_regulator_reg_init ab8500_reg_init[] = {/* * VanaRequestCtrl = HP/LP depending on VxRequest -* VpllRequestCtrl = HP/LP depending on VxRequest * VextSupply1RequestCtrl = HP/LP depending on VxRequest */ -INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL2 ,0xfc ,0x00 ), +INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL2 ,0xf0 ,0x00 ),/* * VextSupply2RequestCtrl = HP/LP depending on VxRequest * VextSupply3RequestCtrl = HP/LP depending on VxRequest
@@ -159,16 +158,12 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = {*/ INIT_REGULATOR_REGISTER (AB8500_REGUREQUESTCTRL4 ,0x07 ,0x00 ),/* -* Vsmps1SysClkReq1HPValid = enabled -* Vsmps2SysClkReq1HPValid = enabled -* Vsmps3SysClkReq1HPValid = enabled * VanaSysClkReq1HPValid = disabled -* VpllSysClkReq1HPValid = enabled * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0xff, 0x17), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0xe8, 0x00),/* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled
@@ -255,17 +250,7 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = {*/ INIT_REGULATOR_REGISTER (AB8500_REGUCTRL1VAMIC ,0x03 ,0x00 ),/* -* Vsmps1Regu = HW control -* Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 -*/ -INIT_REGULATOR_REGISTER (AB8500_VSMPS1REGU ,0x0f ,0x06 ), -/* -* Vsmps2Regu = HW control -* Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 -*/ -INIT_REGULATOR_REGISTER (AB8500_VSMPS2REGU ,0x0f ,0x06 ), -/* -* VPll = Hw controlled +* VPll = Hw controlled (NOTE! PRCMU bits) * VanaRegu = force off */ INIT_REGULATOR_REGISTER(AB8500_VPLLVANAREGU, 0x0f, 0x02),
@@ -288,14 +273,9 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = {*/ INIT_REGULATOR_REGISTER (AB8500_VAUX12REGU ,0x0f ,0x01 ),/* -* Vrf1Regu = HW control * Vaux3Regu = force off */ -INIT_REGULATOR_REGISTER (AB8500_VRF1VAUX3REGU ,0x0f ,0x08 ), -/* -* Vsmps1 = 1.15V -*/ - INIT_REGULATOR_REGISTER(AB8500_VSMPS1SEL1, 0x3f, 0x24), + INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x03, 0x00),/* * Vaux1Sel = 2.5 V */
drivers/regulator/ab8500.c +24 -74
200 lines not on this page · raw message
include/linux/regulator/ab8500.h +0 -12
@@ -62,7 +62,6 @@ struct ab8500_regulator_reg_init {/* AB8500 registers */ enum ab8500_regulator_reg { -AB8500_REGUREQUESTCTRL1 ,AB8500_REGUREQUESTCTRL2 ,AB8500_REGUREQUESTCTRL3 ,AB8500_REGUREQUESTCTRL4 ,
@@ -79,22 +78,11 @@ enum ab8500_regulator_reg {AB8500_REGUMISC1 ,AB8500_VAUDIOSUPPLY ,AB8500_REGUCTRL1VAMIC , -AB8500_VSMPS1REGU , -AB8500_VSMPS2REGU , -AB8500_VSMPS3REGU ,/* NOTE! PRCMU register */ AB8500_VPLLVANAREGU ,AB8500_VREFDDR ,AB8500_EXTSUPPLYREGU ,AB8500_VAUX12REGU ,AB8500_VRF1VAUX3REGU , -AB8500_VSMPS1SEL1 , -AB8500_VSMPS1SEL2 , -AB8500_VSMPS1SEL3 , -AB8500_VSMPS2SEL1 , -AB8500_VSMPS2SEL2 , -AB8500_VSMPS2SEL3 , -AB8500_VSMPS3SEL1 ,/* NOTE! PRCMU register */ -AB8500_VSMPS3SEL2 ,/* NOTE! PRCMU register */ AB8500_VAUX1SEL ,AB8500_VAUX2SEL , AB8500_VRF1VAUX3SEL,
Signature · 1 line
1.7.9.5
PATCH 22/49 regulator: ab8500: Prepare the driver for additional platforms
In reply to Lee JonesMore platforms are to be supported by the AB8500 regulator driver, so in this patch we prepare for their arrival. Instead of using the AB8500 settings blindly, we provide an infrastructure where adding a new platform is as easy as providing a couple of platform specific data structures.
--- drivers/regulator/ab8500.c | 76 ++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 27 deletions(-)
drivers/regulator/ab8500.c +49 -27
@@ -764,46 +764,47 @@ static struct ab8500_reg_init ab8500_reg_init[] = { };static int ab8500_regulator_init_registers (struct platform_device *pdev, +struct ab8500_reg_init *reg_init,int id,int mask,int value) {int err;BUG_ON (value & ~mask); -BUG_ON (mask & ~ab8500_reg_init[id].mask); +BUG_ON (mask & ~reg_init[id].mask);/* initialize register */ err =abx500_mask_and_set_register_interruptible ( &pdev->dev, - ab8500_reg_init[id].bank, - ab8500_reg_init[id].addr, + reg_init[id].bank, + reg_init[id].addr, mask, value);if (err <0 ) {dev_err (&pdev->dev,"Failed to initialize 0x%02x, 0x%02x.\n" , - ab8500_reg_init[id].bank, - ab8500_reg_init[id].addr); + reg_init[id].bank, + reg_init[id].addr);return err; }dev_vdbg (&pdev->dev," init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" , - ab8500_reg_init[id].bank, - ab8500_reg_init[id].addr, + reg_init[id].bank, + reg_init[id].addr, mask, value);return 0 ; }static int ab8500_regulator_register (struct platform_device *pdev, -struct regulator_init_data *init_data, -int id, -struct device_node *np) +struct regulator_init_data *init_data, +struct ab8500_regulator_info *regulator_info, +int id,struct device_node *np) {struct ab8500_regulator_info *info =NULL ;struct regulator_config config = { };int err;/* assign per-regulator data */ - info = &ab8500_regulator_info[id]; + info = ®ulator_info[id]; info->dev = &pdev->dev; config.dev = &pdev->dev;
@@ -829,7 +830,7 @@ static int ab8500_regulator_register(struct platform_device *pdev, info->desc.name);/* when we fail, un-register all earlier regulators */ while (--id >=0 ) { - info = &ab8500_regulator_info[id]; + info = ®ulator_info[id];regulator_unregister (info->regulator); }return err;
@@ -838,7 +839,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,return 0 ; } -static struct of_regulator_match ab8500_regulator_matches[] = { +static struct of_regulator_match ab8500_regulator_match[] = { { .name ="ab8500_ldo_aux1" , .driver_data = (void *)AB8500_LDO_AUX1 , }, { .name ="ab8500_ldo_aux2" , .driver_data = (void *)AB8500_LDO_AUX2 , }, { .name ="ab8500_ldo_aux3" , .driver_data = (void *)AB8500_LDO_AUX3 , },
@@ -852,14 +853,18 @@ static struct of_regulator_match ab8500_regulator_matches[] = { };static int -ab8500_regulator_of_probe (struct platform_device *pdev,struct device_node *np) +ab8500_regulator_of_probe (struct platform_device *pdev, +struct ab8500_regulator_info *regulator_info, +int regulator_info_size, +struct of_regulator_match *match, +struct device_node *np) {int err, i; -for (i =0 ; i <ARRAY_SIZE (ab8500_regulator_info); i++) { +for (i =0 ; i < regulator_info_size; i++) { err =ab8500_regulator_register ( - pdev, ab8500_regulator_matches[i].init_data, - i, ab8500_regulator_matches[i].of_node); + pdev, match[i].init_data, regulator_info, + i, match[i].of_node);if (err)return err; }
@@ -871,21 +876,32 @@ static int ab8500_regulator_probe(struct platform_device *pdev) {struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent);struct device_node *np = pdev->dev.of_node; +struct of_regulator_match *match;struct ab8500_platform_data *ppdata;struct ab8500_regulator_platform_data *pdata;int i, err; +struct ab8500_regulator_info *regulator_info; +int regulator_info_size; +struct ab8500_reg_init *reg_init; +int reg_init_size; + + regulator_info = ab8500_regulator_info; + regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); + reg_init = ab8500_reg_init; + reg_init_size =AB8500_NUM_REGULATOR_REGISTERS ; + match = ab8500_regulator_match; + match_size = ARRAY_SIZE(ab8500_regulator_match)if (np) { - err =of_regulator_match (&pdev->dev, np, - ab8500_regulator_matches, -ARRAY_SIZE (ab8500_regulator_matches)); + err =of_regulator_match (&pdev->dev, np, match, match_size);if (err <0 ) {dev_err (&pdev->dev,"Error parsing regulator init data: %d\n" , err);return err; } - err =ab8500_regulator_of_probe (pdev, np); + err =ab8500_regulator_of_probe (pdev, regulator_info, + regulator_info_size, match, np);return err; }
@@ -907,7 +923,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) }/* make sure the platform data has the correct size */ -if (pdata->num_regulator !=ARRAY_SIZE (ab8500_regulator_info)) { +if (pdata->num_regulator != regulator_info_size) {dev_err (&pdev->dev,"Configuration error: size mismatch.\n" );return -EINVAL ; }
@@ -928,7 +944,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev)/* check for configuration errors */ BUG_ON (id >=AB8500_NUM_REGULATOR_REGISTERS ); - err =ab8500_regulator_init_registers (pdev, id, mask, value); + err =ab8500_regulator_init_registers (pdev, reg_init, id, mask, value);if (err <0 )return err; }
@@ -939,8 +955,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev)return err;/* register all regulators */ -for (i =0 ; i <ARRAY_SIZE (ab8500_regulator_info); i++) { - err =ab8500_regulator_register (pdev, &pdata->regulator[i], i,NULL ); +for (i =0 ; i < regulator_info_size; i++) { + err =ab8500_regulator_register (pdev, &pdata->regulator[i], + regulator_info, i,NULL );if (err <0 )return err; }
@@ -951,10 +968,15 @@ static int ab8500_regulator_probe(struct platform_device *pdev)static int ab8500_regulator_remove (struct platform_device *pdev) {int i, err; +struct ab8500_regulator_info *regulator_info; +int regulator_info_size; -for (i =0 ; i <ARRAY_SIZE (ab8500_regulator_info); i++) { + regulator_info = ab8500_regulator_info; + regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); + +for (i =0 ; i < regulator_info_size; i++) {struct ab8500_regulator_info *info =NULL ; - info = &ab8500_regulator_info[i]; + info = ®ulator_info[i];dev_vdbg (rdev_get_dev (info->regulator),"%s-remove\n" , info->desc.name);
Signature · 1 line
1.7.9.5
PATCH 23/49 regulator: ab8500: Add support for the ab9540
In reply to Lee JonesTo obtain full AB9540 regulator support, the AB8500 regulator driver first needs to know its register layout and their initialisation values for each. That information is provided via a couple of large data structures which we provide here.
--- drivers/regulator/ab8500.c | 582 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 573 insertions(+), 9 deletions(-)
drivers/regulator/ab8500.c +573 -9
@@ -375,6 +375,7 @@ static struct regulator_ops ab8500_regulator_ops = { .list_voltage = regulator_list_voltage_table, }; +/* AB8500 regulator information */ static struct ab8500_regulator_info ab8500_regulator_info[AB8500_NUM_REGULATORS ] = {/*
@@ -576,8 +577,264 @@ static struct ab8500_regulator_info .update_val_idle = 0x0c, .update_val_normal = 0x04, }, +}; + +/* AB9540 regulator information */ +static struct ab8500_regulator_info + ab9540_regulator_info[AB9540_NUM_REGULATORS ] = { +/* +* Variable Voltage Regulators +* name, min mV, max mV, +* update bank, reg, mask, enable val +* volt bank, reg, mask, table, table length +*/ + [AB9540_LDO_AUX1 ] = { + .desc = { + .name ="LDO-AUX1" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUX1 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vauxn_voltages), + }, + .min_uV =1100000 , + .max_uV =3300000 , + .load_lp_uA =5000 , + .update_bank =0x04 , + .update_reg =0x09 , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , + .voltage_bank =0x04 , + .voltage_reg =0x1f , + .voltage_mask =0x0f , + .voltages = ldo_vauxn_voltages, + .voltages_len =ARRAY_SIZE (ldo_vauxn_voltages), + }, + [AB9540_LDO_AUX2 ] = { + .desc = { + .name ="LDO-AUX2" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUX2 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vauxn_voltages), + }, + .min_uV =1100000 , + .max_uV =3300000 , + .load_lp_uA =5000 , + .update_bank =0x04 , + .update_reg =0x09 , + .update_mask =0x0c , + .update_val =0x04 , + .update_val_idle =0x0c , + .update_val_normal =0x04 , + .voltage_bank =0x04 , + .voltage_reg =0x20 , + .voltage_mask =0x0f , + .voltages = ldo_vauxn_voltages, + .voltages_len =ARRAY_SIZE (ldo_vauxn_voltages), + }, + [AB9540_LDO_AUX3 ] = { + .desc = { + .name ="LDO-AUX3" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUX3 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vaux3_voltages), + }, + .min_uV =1100000 , + .max_uV =3300000 , + .load_lp_uA =5000 , + .update_bank =0x04 , + .update_reg =0x0a , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , + .voltage_bank =0x04 , + .voltage_reg =0x21 , + .voltage_mask =0x07 , + .voltages = ldo_vaux3_voltages, + .voltages_len =ARRAY_SIZE (ldo_vaux3_voltages), + }, + [AB9540_LDO_AUX4 ] = { + .desc = { + .name ="LDO-AUX4" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB9540_LDO_AUX4 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vauxn_voltages), + }, + .min_uV =1100000 , + .max_uV =3300000 , + .load_lp_uA =5000 , +/* values for Vaux4Regu register */ + .update_bank =0x04 , + .update_reg =0x2e , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , +/* values for Vaux4SEL register */ + .voltage_bank =0x04 , + .voltage_reg =0x2f , + .voltage_mask =0x0f , + .voltages = ldo_vauxn_voltages, + .voltages_len =ARRAY_SIZE (ldo_vauxn_voltages), + }, + [AB9540_LDO_INTCORE ] = { + .desc = { + .name ="LDO-INTCORE" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_INTCORE , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vintcore_voltages), + }, + .min_uV =1100000 , + .max_uV =3300000 , + .load_lp_uA =5000 , + .update_bank =0x03 , + .update_reg =0x80 , + .update_mask =0x44 , + .update_val =0x44 , + .update_val_idle =0x44 , + .update_val_normal =0x04 , + .voltage_bank =0x03 , + .voltage_reg =0x80 , + .voltage_mask =0x38 , + .voltages = ldo_vintcore_voltages, + .voltages_len =ARRAY_SIZE (ldo_vintcore_voltages), + }, +/* +* Fixed Voltage Regulators +* name, fixed mV, +* update bank, reg, mask, enable val +*/ + [AB9540_LDO_TVOUT ] = { + .desc = { + .name ="LDO-TVOUT" , + .ops = &ab8500_regulator_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_TVOUT , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .delay =10000 , + .fixed_uV =2000000 , + .load_lp_uA =1000 , + .update_bank =0x03 , + .update_reg =0x80 , + .update_mask =0x82 , + .update_val =0x02 , + .update_val_idle =0x82 , + .update_val_normal =0x02 , + }, + [AB9540_LDO_USB ] = { + .desc = { + .name ="LDO-USB" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB9540_LDO_USB , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .fixed_uV =3300000 , + .update_bank =0x03 , + .update_reg =0x82 , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , + }, + [AB9540_LDO_AUDIO ] = { + .desc = { + .name ="LDO-AUDIO" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUDIO , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .fixed_uV =2000000 , + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x02 , + .update_val =0x02 , + }, + [AB9540_LDO_ANAMIC1 ] = { + .desc = { + .name ="LDO-ANAMIC1" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_ANAMIC1 , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .fixed_uV =2050000 , + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x08 , + .update_val =0x08 , + }, + [AB9540_LDO_ANAMIC2 ] = { + .desc = { + .name ="LDO-ANAMIC2" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_ANAMIC2 , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .fixed_uV =2050000 , + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x10 , + .update_val =0x10 , + }, + [AB9540_LDO_DMIC ] = { + .desc = { + .name ="LDO-DMIC" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_DMIC , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .fixed_uV =1800000 , + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x04 , + .update_val =0x04 , + }, +/* +* Regulators with fixed voltage and normal/idle modes +*/ + [AB9540_LDO_ANA ] = { + .desc = { + .name ="LDO-ANA" , + .ops = &ab8500_regulator_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_ANA , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .fixed_uV =1200000 , + .load_lp_uA =1000 , + .load_lp_uA =1000 , + .update_bank =0x04 , + .update_reg =0x06 , + .update_mask =0x0c , + .update_val =0x08 , + .update_val_idle =0x0c , + .update_val_normal =0x08 , + }, }; struct ab8500_reg_init {
@@ -593,6 +850,7 @@ struct ab8500_reg_init { .mask = _mask, \ } +/* AB8500 register init */ static struct ab8500_reg_init ab8500_reg_init[] = {/* * 0x30, VanaRequestCtrl
@@ -763,6 +1021,281 @@ static struct ab8500_reg_init ab8500_reg_init[] = { REG_INIT(AB8500_REGUCTRLDISCH2, 0x04, 0x44, 0x16), }; +/* AB9540 register init */ +static struct ab8500_reg_init ab9540_reg_init[] = { +/* +* 0x03, VarmRequestCtrl +* 0x0c, VapeRequestCtrl +* 0x30, Vsmps1RequestCtrl +* 0xc0, Vsmps2RequestCtrl +*/ +REG_INIT (AB9540_REGUREQUESTCTRL1 ,0x03 ,0x03 ,0xff ), +/* +* 0x03, Vsmps3RequestCtrl +* 0x0c, VpllRequestCtrl +* 0x30, VanaRequestCtrl +* 0xc0, VextSupply1RequestCtrl +*/ +REG_INIT (AB9540_REGUREQUESTCTRL2 ,0x03 ,0x04 ,0xff ), +/* +* 0x03, VextSupply2RequestCtrl +* 0x0c, VextSupply3RequestCtrl +* 0x30, Vaux1RequestCtrl +* 0xc0, Vaux2RequestCtrl +*/ +REG_INIT (AB9540_REGUREQUESTCTRL3 ,0x03 ,0x05 ,0xff ), +/* +* 0x03, Vaux3RequestCtrl +* 0x04, SwHPReq +*/ +REG_INIT (AB9540_REGUREQUESTCTRL4 ,0x03 ,0x06 ,0x07 ), +/* +* 0x01, Vsmps1SysClkReq1HPValid +* 0x02, Vsmps2SysClkReq1HPValid +* 0x04, Vsmps3SysClkReq1HPValid +* 0x08, VanaSysClkReq1HPValid +* 0x10, VpllSysClkReq1HPValid +* 0x20, Vaux1SysClkReq1HPValid +* 0x40, Vaux2SysClkReq1HPValid +* 0x80, Vaux3SysClkReq1HPValid +*/ +REG_INIT (AB9540_REGUSYSCLKREQ1HPVALID1 ,0x03 ,0x07 ,0xff ), +/* +* 0x01, VapeSysClkReq1HPValid +* 0x02, VarmSysClkReq1HPValid +* 0x04, VbbSysClkReq1HPValid +* 0x08, VmodSysClkReq1HPValid +* 0x10, VextSupply1SysClkReq1HPValid +* 0x20, VextSupply2SysClkReq1HPValid +* 0x40, VextSupply3SysClkReq1HPValid +*/ +REG_INIT (AB9540_REGUSYSCLKREQ1HPVALID2 ,0x03 ,0x08 ,0x7f ), +/* +* 0x01, Vsmps1HwHPReq1Valid +* 0x02, Vsmps2HwHPReq1Valid +* 0x04, Vsmps3HwHPReq1Valid +* 0x08, VanaHwHPReq1Valid +* 0x10, VpllHwHPReq1Valid +* 0x20, Vaux1HwHPReq1Valid +* 0x40, Vaux2HwHPReq1Valid +* 0x80, Vaux3HwHPReq1Valid +*/ +REG_INIT (AB9540_REGUHWHPREQ1VALID1 ,0x03 ,0x09 ,0xff ), +/* +* 0x01, VextSupply1HwHPReq1Valid +* 0x02, VextSupply2HwHPReq1Valid +* 0x04, VextSupply3HwHPReq1Valid +* 0x08, VmodHwHPReq1Valid +*/ +REG_INIT (AB9540_REGUHWHPREQ1VALID2 ,0x03 ,0x0a ,0x0f ), +/* +* 0x01, Vsmps1HwHPReq2Valid +* 0x02, Vsmps2HwHPReq2Valid +* 0x03, Vsmps3HwHPReq2Valid +* 0x08, VanaHwHPReq2Valid +* 0x10, VpllHwHPReq2Valid +* 0x20, Vaux1HwHPReq2Valid +* 0x40, Vaux2HwHPReq2Valid +* 0x80, Vaux3HwHPReq2Valid +*/ +REG_INIT (AB9540_REGUHWHPREQ2VALID1 ,0x03 ,0x0b ,0xff ), +/* +* 0x01, VextSupply1HwHPReq2Valid +* 0x02, VextSupply2HwHPReq2Valid +* 0x04, VextSupply3HwHPReq2Valid +* 0x08, VmodHwHPReq2Valid +*/ +REG_INIT (AB9540_REGUHWHPREQ2VALID2 ,0x03 ,0x0c ,0x0f ), +/* +* 0x01, VapeSwHPReqValid +* 0x02, VarmSwHPReqValid +* 0x04, Vsmps1SwHPReqValid +* 0x08, Vsmps2SwHPReqValid +* 0x10, Vsmps3SwHPReqValid +* 0x20, VanaSwHPReqValid +* 0x40, VpllSwHPReqValid +* 0x80, Vaux1SwHPReqValid +*/ +REG_INIT (AB9540_REGUSWHPREQVALID1 ,0x03 ,0x0d ,0xff ), +/* +* 0x01, Vaux2SwHPReqValid +* 0x02, Vaux3SwHPReqValid +* 0x04, VextSupply1SwHPReqValid +* 0x08, VextSupply2SwHPReqValid +* 0x10, VextSupply3SwHPReqValid +* 0x20, VmodSwHPReqValid +*/ +REG_INIT (AB9540_REGUSWHPREQVALID2 ,0x03 ,0x0e ,0x3f ), +/* +* 0x02, SysClkReq2Valid1 +* ... +* 0x80, SysClkReq8Valid1 +*/ +REG_INIT (AB9540_REGUSYSCLKREQVALID1 ,0x03 ,0x0f ,0xfe ), +/* +* 0x02, SysClkReq2Valid2 +* ... +* 0x80, SysClkReq8Valid2 +*/ +REG_INIT (AB9540_REGUSYSCLKREQVALID2 ,0x03 ,0x10 ,0xfe ), +/* +* 0x01, Vaux4SwHPReqValid +* 0x02, Vaux4HwHPReq2Valid +* 0x04, Vaux4HwHPReq1Valid +* 0x08, Vaux4SysClkReq1HPValid +*/ +REG_INIT (AB9540_REGUVAUX4REQVALID ,0x03 ,0x11 ,0x0f ), +/* +* 0x02, VTVoutEna +* 0x04, Vintcore12Ena +* 0x38, Vintcore12Sel +* 0x40, Vintcore12LP +* 0x80, VTVoutLP +*/ +REG_INIT (AB9540_REGUMISC1 ,0x03 ,0x80 ,0xfe ), +/* +* 0x02, VaudioEna +* 0x04, VdmicEna +* 0x08, Vamic1Ena +* 0x10, Vamic2Ena +*/ +REG_INIT (AB9540_VAUDIOSUPPLY ,0x03 ,0x83 ,0x1e ), +/* +* 0x01, Vamic1_dzout +* 0x02, Vamic2_dzout +*/ +REG_INIT (AB9540_REGUCTRL1VAMIC ,0x03 ,0x84 ,0x03 ), +/* +* 0x03, Vsmps1Regu +* 0x0c, Vsmps1SelCtrl +* 0x10, Vsmps1AutoMode +* 0x20, Vsmps1PWMMode +*/ +REG_INIT (AB9540_VSMPS1REGU ,0x04 ,0x03 ,0x3f ), +/* +* 0x03, Vsmps2Regu +* 0x0c, Vsmps2SelCtrl +* 0x10, Vsmps2AutoMode +* 0x20, Vsmps2PWMMode +*/ +REG_INIT (AB9540_VSMPS2REGU ,0x04 ,0x04 ,0x3f ), +/* +* 0x03, Vsmps3Regu +* 0x0c, Vsmps3SelCtrl +* NOTE! PRCMU register +*/ +REG_INIT (AB9540_VSMPS3REGU ,0x04 ,0x05 ,0x0f ), +/* +* 0x03, VpllRegu +* 0x0c, VanaRegu +*/ +REG_INIT (AB9540_VPLLVANAREGU ,0x04 ,0x06 ,0x0f ), +/* +* 0x03, VextSupply1Regu +* 0x0c, VextSupply2Regu +* 0x30, VextSupply3Regu +* 0x40, ExtSupply2Bypass +* 0x80, ExtSupply3Bypass +*/ +REG_INIT (AB9540_EXTSUPPLYREGU ,0x04 ,0x08 ,0xff ), +/* +* 0x03, Vaux1Regu +* 0x0c, Vaux2Regu +*/ +REG_INIT (AB9540_VAUX12REGU ,0x04 ,0x09 ,0x0f ), +/* +* 0x0c, Vrf1Regu +* 0x03, Vaux3Regu +*/ +REG_INIT (AB9540_VRF1VAUX3REGU ,0x04 ,0x0a ,0x0f ), +/* +* 0x3f, Vsmps1Sel1 +*/ +REG_INIT (AB9540_VSMPS1SEL1 ,0x04 ,0x13 ,0x3f ), +/* +* 0x3f, Vsmps1Sel2 +*/ +REG_INIT (AB9540_VSMPS1SEL2 ,0x04 ,0x14 ,0x3f ), +/* +* 0x3f, Vsmps1Sel3 +*/ +REG_INIT (AB9540_VSMPS1SEL3 ,0x04 ,0x15 ,0x3f ), +/* +* 0x3f, Vsmps2Sel1 +*/ +REG_INIT (AB9540_VSMPS2SEL1 ,0x04 ,0x17 ,0x3f ), +/* +* 0x3f, Vsmps2Sel2 +*/ +REG_INIT (AB9540_VSMPS2SEL2 ,0x04 ,0x18 ,0x3f ), +/* +* 0x3f, Vsmps2Sel3 +*/ +REG_INIT (AB9540_VSMPS2SEL3 ,0x04 ,0x19 ,0x3f ), +/* +* 0x7f, Vsmps3Sel1 +* NOTE! PRCMU register +*/ +REG_INIT (AB9540_VSMPS3SEL1 ,0x04 ,0x1b ,0x7f ), +/* +* 0x7f, Vsmps3Sel2 +* NOTE! PRCMU register +*/ +REG_INIT (AB9540_VSMPS3SEL2 ,0x04 ,0x1c ,0x7f ), +/* +* 0x0f, Vaux1Sel +*/ +REG_INIT (AB9540_VAUX1SEL ,0x04 ,0x1f ,0x0f ), +/* +* 0x0f, Vaux2Sel +*/ +REG_INIT (AB9540_VAUX2SEL ,0x04 ,0x20 ,0x0f ), +/* +* 0x07, Vaux3Sel +* 0x30, Vrf1Sel +*/ +REG_INIT (AB9540_VRF1VAUX3SEL ,0x04 ,0x21 ,0x37 ), +/* +* 0x01, VextSupply12LP +*/ +REG_INIT (AB9540_REGUCTRL2SPARE ,0x04 ,0x22 ,0x01 ), +/* +* 0x03, Vaux4RequestCtrl +*/ +REG_INIT (AB9540_VAUX4REQCTRL ,0x04 ,0x2d ,0x03 ), +/* +* 0x03, Vaux4Regu +*/ +REG_INIT (AB9540_VAUX4REGU ,0x04 ,0x2e ,0x03 ), +/* +* 0x08, Vaux4Sel +*/ +REG_INIT (AB9540_VAUX4SEL ,0x04 ,0x2f ,0x0f ), +/* +* 0x01, VpllDisch +* 0x02, Vrf1Disch +* 0x04, Vaux1Disch +* 0x08, Vaux2Disch +* 0x10, Vaux3Disch +* 0x20, Vintcore12Disch +* 0x40, VTVoutDisch +* 0x80, VaudioDisch +*/ +REG_INIT (AB9540_REGUCTRLDISCH ,0x04 ,0x43 ,0xff ), +/* +* 0x01, VsimDisch +* 0x02, VanaDisch +* 0x04, VdmicPullDownEna +* 0x08, VpllPullDownEna +* 0x10, VdmicDisch +*/ +REG_INIT (AB9540_REGUCTRLDISCH2 ,0x04 ,0x44 ,0x1f ), +/* +* 0x01, Vaux4Disch +*/ +REG_INIT (AB9540_REGUCTRLDISCH3 ,0x04 ,0x48 ,0x01 ), +}; +static int ab8500_regulator_init_registers (struct platform_device *pdev,struct ab8500_reg_init *reg_init,int id,int mask,int value)
@@ -799,6 +1332,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,struct ab8500_regulator_info *regulator_info, int id, struct device_node *np) { + struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);struct ab8500_regulator_info *info =NULL ;struct regulator_config config = { };int err;
@@ -813,7 +1347,7 @@ static int ab8500_regulator_register(struct platform_device *pdev, config.of_node = np;/* fix for hardware before ab8500v2.0 */ -if (abx500_get_chip_id (info->dev) <0x20 ) { +if (is_ab8500_1p1_or_earlier (ab8500)) {if (info->desc.id ==AB8500_LDO_AUX3 ) { info->desc.n_voltages =ARRAY_SIZE (ldo_vauxn_voltages);
@@ -852,6 +1386,20 @@ static struct of_regulator_match ab8500_regulator_match[] = { { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, }; +static struct of_regulator_match ab9540_regulator_match[] = { + { .name ="ab9540_ldo_aux1" , .driver_data = (void *)AB9540_LDO_AUX1 , }, + { .name ="ab9540_ldo_aux2" , .driver_data = (void *)AB9540_LDO_AUX2 , }, + { .name ="ab9540_ldo_aux3" , .driver_data = (void *)AB9540_LDO_AUX3 , }, + { .name ="ab9540_ldo_intcore" , .driver_data = (void *)AB9540_LDO_INTCORE , }, + { .name ="ab9540_ldo_tvout" , .driver_data = (void *)AB9540_LDO_TVOUT , }, + { .name ="ab9540_ldo_usb" , .driver_data = (void *)AB9540_LDO_USB , }, + { .name ="ab9540_ldo_audio" , .driver_data = (void *)AB9540_LDO_AUDIO , }, + { .name ="ab9540_ldo_anamic1" , .driver_data = (void *)AB9540_LDO_ANAMIC1 , }, + { .name ="ab9540_ldo_amamic2" , .driver_data = (void *)AB9540_LDO_ANAMIC2 , }, + { .name ="ab9540_ldo_dmic" , .driver_data = (void *)AB9540_LDO_DMIC , }, + { .name ="ab9540_ldo_ana" , .driver_data = (void *)AB9540_LDO_ANA , }, +}; + static int ab8500_regulator_of_probe(struct platform_device *pdev, struct ab8500_regulator_info *regulator_info,
@@ -885,12 +1433,21 @@ static int ab8500_regulator_probe(struct platform_device *pdev)struct ab8500_reg_init *reg_init;int reg_init_size; - regulator_info = ab8500_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); - reg_init = ab8500_reg_init; - reg_init_size =AB8500_NUM_REGULATOR_REGISTERS ; - match = ab8500_regulator_match; - match_size = ARRAY_SIZE(ab8500_regulator_match) +if (is_ab9540 (ab8500)) { + regulator_info = ab9540_regulator_info; + regulator_info_size =ARRAY_SIZE (ab9540_regulator_info); + reg_init = ab9540_reg_init; + reg_init_size =AB9540_NUM_REGULATOR_REGISTERS ; + match = ab9540_regulator_match; + match_size = ARRAY_SIZE(ab9540_regulator_match) + }else { + regulator_info = ab8500_regulator_info; + regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); + reg_init = ab8500_reg_init; + reg_init_size =AB8500_NUM_REGULATOR_REGISTERS ; + match = ab8500_regulator_match; + match_size = ARRAY_SIZE(ab8500_regulator_match) + }if (np) { err =of_regulator_match (&pdev->dev, np, match, match_size);
@@ -968,11 +1525,18 @@ static int ab8500_regulator_probe(struct platform_device *pdev)static int ab8500_regulator_remove (struct platform_device *pdev) {int i, err; +struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent);struct ab8500_regulator_info *regulator_info;int regulator_info_size; - regulator_info = ab8500_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); + +if (is_ab9540 (ab8500)) { + regulator_info = ab9540_regulator_info; + regulator_info_size =ARRAY_SIZE (ab9540_regulator_info); + }else { + regulator_info = ab8500_regulator_info; + regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); + }for (i =0 ; i < regulator_info_size; i++) {struct ab8500_regulator_info *info =NULL ;
Signature · 1 line
1.7.9.5
PATCH 24/49 regulator: ab8500: Correct TVOUT regulator start-up delay
In reply to Lee JonesFrom: Jonas Aaberg <[email protected]>
Update TVOUT regulator to match specification. (Was 10ms, changed to 500us.)
--- drivers/regulator/ab8500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/ab8500.c +2 -2
@@ -484,9 +484,9 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = 1, .min_uV = 2000000, - .enable_time = 10000, + .enable_time = 500, }, - .delay = 10000, + .delay = 500, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
Signature · 1 line
1.7.9.5
PATCH 25/49 regulator: ab8500-ext: Add support for AB8505/AB9540
In reply to Lee JonesFrom: Bengt Jonsson <[email protected]>
The external regulator driver checks for old AB8500 HW to apply a fix. This patch adds a check to see that it is a AB8500 (not AB8505/AB9540).
--- drivers/regulator/ab8500-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/ab8500-ext.c +1 -1
@@ -386,7 +386,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) }/* check for AB8500 2.x */ -if (abx500_get_chip_id (&pdev->dev) <0x30 ) { +if (is_ab8500_2p0_or_earlier (ab8500)) {struct ab8500_ext_regulator_info *info;/* VextSupply3LPn is inverted on AB8500 2.x */
Signature · 1 line
1.7.9.5
PATCH 26/49 ARM: ux500: Partially revert changes surrounding audio regulators
In reply to Lee JonesFrom: Philippe Langlais <[email protected]>
--- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +4 -4
@@ -108,22 +108,22 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {static struct regulator_consumer_supply ab8500_vaud_consumers[] = {/* AB8500 audio-codec main supply */ -REGULATOR_SUPPLY ("vaud" ,"ab8500-codec.0" ), +REGULATOR_SUPPLY ("v-audio" ,NULL ), };static struct regulator_consumer_supply ab8500_vamic1_consumers[] = {/* AB8500 audio-codec Mic1 supply */ -REGULATOR_SUPPLY ("vamic1" ,"ab8500-codec.0" ), +REGULATOR_SUPPLY ("v-amic1" ,NULL ), };static struct regulator_consumer_supply ab8500_vamic2_consumers[] = {/* AB8500 audio-codec Mic2 supply */ -REGULATOR_SUPPLY ("vamic2" ,"ab8500-codec.0" ), +REGULATOR_SUPPLY ("v-amic2" ,NULL ), };static struct regulator_consumer_supply ab8500_vdmic_consumers[] = {/* AB8500 audio-codec DMic supply */ -REGULATOR_SUPPLY ("vdmic" ,"ab8500-codec.0" ), +REGULATOR_SUPPLY ("v-dmic" ,NULL ), };static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {
Signature · 1 line
1.7.9.5
Re: [PATCH 26/49] ARM: ux500: Partially revert changes surrounding audio regulators
Quoted 4 lines · Lee Jones
From: Philippe Langlais <[email protected]>
Signed-off-by Philippe Langlais <[email protected]>Signed-off-by Lee Jones <[email protected]>
There is an awfully small commit blurb for this change. Actually nothing. We need some explanation, and I want Ola to be in on this change.
Yours,
Linus Walleij
Re: [PATCH 26/49] ARM: ux500: Partially revert changes surrounding audio regulators
Quoted 10 lines · Linus Walleij
Quoted 4 lines · Lee Jones
From: Philippe Langlais <[email protected]>
Signed-off-by Philippe Langlais <[email protected]>Signed-off-by Lee Jones <[email protected]>There is an awfully small commit blurb for this change. Actually nothing. We need some explanation, and I want Ola to be in on this change.
I don't actually know what this is to be honest. I'm just echoing the internal development process.
Feedback from Ola would be great.
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 26/49] ARM: ux500: Partially revert changes surrounding audio regulators
In reply to Linus WalleijQuoted 10 lines · Linus Walleij
Quoted 4 lines · Lee Jones
From: Philippe Langlais <[email protected]>
Signed-off-by Philippe Langlais <[email protected]>Signed-off-by Lee Jones <[email protected]>There is an awfully small commit blurb for this change. Actually nothing. We need some explanation, and I want Ola to be in on this change.
Until we here back from Ola or Philippe, I'm going to pull this patch.
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 27/49 regulator: ab8500: add support for ab8505
In reply to Lee JonesTo obtain full AB8505 regulator support, the AB8500 regulator driver first needs to know its register layout and their initialisation values for each. That information is provided via a couple of large data structures which we provide here.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 511 +++++++++++++++++++- arch/arm/mach-ux500/board-mop500-regulators.h | 1 + drivers/regulator/ab8500.c | 616 +++++++++++++++++++++++++ include/linux/regulator/ab8500.h | 75 ++- 4 files changed, 1194 insertions(+), 9 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +504 -7
@@ -5,6 +5,7 @@* * Authors: Sundar Iyer <[email protected]> * Bengt Jonsson <[email protected]> +* Daniel Willerud <[email protected]> * * MOP500 board specific initialization for regulators */
@@ -99,6 +100,27 @@ static struct regulator_consumer_supply ab8500_vaux3_consumers[] = { REGULATOR_SUPPLY("vmmc", "sdi0"), }; +static struct regulator_consumer_supply ab8505_vaux4_consumers[] = { +}; + +static struct regulator_consumer_supply ab8505_vaux5_consumers[] = { +}; + +static struct regulator_consumer_supply ab8505_vaux6_consumers[] = { +}; + +static struct regulator_consumer_supply ab8505_vaux8_consumers[] = { +/* AB8500 audio codec device */ +REGULATOR_SUPPLY ("v-aux8" ,NULL ), +}; + +static struct regulator_consumer_supply ab8505_vadc_consumers[] = { +/* Internal general-purpose ADC */ +REGULATOR_SUPPLY ("vddadc" ,"ab8500-gpadc.0" ), +/* ADC for charger */ +REGULATOR_SUPPLY ("vddadc" ,"ab8500-charger.0" ), +}; +static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {/* TV-out DENC supply */ REGULATOR_SUPPLY ("vtvout" ,"ab8500-denc.0" ),
@@ -133,6 +155,11 @@ static struct regulator_consumer_supply ab8500_vintcore_consumers[] = { REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"), }; +static struct regulator_consumer_supply ab8505_usb_consumers[] = { +/* HS USB OTG physical interface */ +REGULATOR_SUPPLY ("v-usb" ,NULL ), +}; +static struct regulator_consumer_supply ab8500_vana_consumers[] = {/* External displays, connector on board, 1v8 power supply */ REGULATOR_SUPPLY ("vsmps2" ,"mcde.0" ),
@@ -472,6 +499,450 @@ static struct regulator_init_data ab8500_ext_regulators[] = { }, }; +/* ab8505 regulator register initialization */ +static struct ab8500_regulator_reg_init ab8505_reg_init[] = { +/* +* VarmRequestCtrl +* VsmpsCRequestCtrl +* VsmpsARequestCtrl +* VsmpsBRequestCtrl +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUREQUESTCTRL1 ,0x00 ,0x00 ), +/* +* VsafeRequestCtrl +* VpllRequestCtrl +* VanaRequestCtrl = HP/LP depending on VxRequest +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUREQUESTCTRL2 ,0x30 ,0x00 ), +/* +* Vaux1RequestCtrl = HP/LP depending on VxRequest +* Vaux2RequestCtrl = HP/LP depending on VxRequest +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUREQUESTCTRL3 ,0xf0 ,0x00 ), +/* +* Vaux3RequestCtrl = HP/LP depending on VxRequest +* SwHPReq = Control through SWValid disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUREQUESTCTRL4 ,0x07 ,0x00 ), +/* +* VsmpsASysClkReq1HPValid +* VsmpsBSysClkReq1HPValid +* VsafeSysClkReq1HPValid +* VanaSysClkReq1HPValid = disabled +* VpllSysClkReq1HPValid +* Vaux1SysClkReq1HPValid = disabled +* Vaux2SysClkReq1HPValid = disabled +* Vaux3SysClkReq1HPValid = disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUSYSCLKREQ1HPVALID1 ,0xe8 ,0x00 ), +/* +* VsmpsCSysClkReq1HPValid +* VarmSysClkReq1HPValid +* VbbSysClkReq1HPValid +* VsmpsMSysClkReq1HPValid +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUSYSCLKREQ1HPVALID2 ,0x00 ,0x00 ), +/* +* VsmpsAHwHPReq1Valid +* VsmpsBHwHPReq1Valid +* VsafeHwHPReq1Valid +* VanaHwHPReq1Valid = disabled +* VpllHwHPReq1Valid +* Vaux1HwHPreq1Valid = disabled +* Vaux2HwHPReq1Valid = disabled +* Vaux3HwHPReqValid = disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUHWHPREQ1VALID1 ,0xe8 ,0x00 ), +/* +* VsmpsMHwHPReq1Valid +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUHWHPREQ1VALID2 ,0x00 ,0x00 ), +/* +* VsmpsAHwHPReq2Valid +* VsmpsBHwHPReq2Valid +* VsafeHwHPReq2Valid +* VanaHwHPReq2Valid = disabled +* VpllHwHPReq2Valid +* Vaux1HwHPReq2Valid = disabled +* Vaux2HwHPReq2Valid = disabled +* Vaux3HwHPReq2Valid = disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUHWHPREQ2VALID1 ,0xe8 ,0x00 ), +/* +* VsmpsMHwHPReq2Valid +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUHWHPREQ2VALID2 ,0x00 ,0x00 ), +/** +* VsmpsCSwHPReqValid +* VarmSwHPReqValid +* VsmpsASwHPReqValid +* VsmpsBSwHPReqValid +* VsafeSwHPReqValid +* VanaSwHPReqValid +* VanaSwHPReqValid = disabled +* VpllSwHPReqValid +* Vaux1SwHPReqValid = disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUSWHPREQVALID1 ,0xa0 ,0x00 ), +/* +* Vaux2SwHPReqValid = disabled +* Vaux3SwHPReqValid = disabled +* VsmpsMSwHPReqValid +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUSWHPREQVALID2 ,0x03 ,0x00 ), +/* +* SysClkReq2Valid1 = SysClkReq2 controlled +* SysClkReq3Valid1 = disabled +* SysClkReq4Valid1 = SysClkReq4 controlled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUSYSCLKREQVALID1 ,0x0e ,0x0a ), +/* +* SysClkReq2Valid2 = disabled +* SysClkReq3Valid2 = disabled +* SysClkReq4Valid2 = disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUSYSCLKREQVALID2 ,0x0e ,0x00 ), +/* +* Vaux4SwHPReqValid +* Vaux4HwHPReq2Valid +* Vaux4HwHPReq1Valid +* Vaux4SysClkReq1HPValid +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUVAUX4REQVALID ,0x00 ,0x00 ), +/* +* VadcEna = disabled +* VintCore12Ena = disabled +* VintCore12Sel = 1.25 V +* VintCore12LP = inactive (HP) +* VadcLP = inactive (HP) +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUMISC1 ,0xfe ,0x10 ), +/* +* VaudioEna = disabled +* Vaux8Ena = disabled +* Vamic1Ena = disabled +* Vamic2Ena = disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUDIOSUPPLY ,0x1e ,0x00 ), +/* +* Vamic1_dzout = high-Z when Vamic1 is disabled +* Vamic2_dzout = high-Z when Vamic2 is disabled +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUCTRL1VAMIC ,0x03 ,0x00 ), +/* +* VsmpsARegu +* VsmpsASelCtrl +* VsmpsAAutoMode +* VsmpsAPWMMode +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSAREGU ,0x00 ,0x00 ), +/* +* VsmpsBRegu +* VsmpsBSelCtrl +* VsmpsBAutoMode +* VsmpsBPWMMode +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSBREGU ,0x00 ,0x00 ), +/* +* VsafeRegu +* VsafeSelCtrl +* VsafeAutoMode +* VsafePWMMode +*/ +INIT_REGULATOR_REGISTER (AB8505_VSAFEREGU ,0x00 ,0x00 ), +/* +* VPll = Hw controlled (NOTE! PRCMU bits) +* VanaRegu = force off +*/ +INIT_REGULATOR_REGISTER (AB8505_VPLLVANAREGU ,0x0f ,0x02 ), +/* +* VextSupply1Regu = force OFF (OTP_ExtSupply12LPnPolarity 1) +* VextSupply2Regu = force OFF (OTP_ExtSupply12LPnPolarity 1) +* VextSupply3Regu = force OFF (OTP_ExtSupply3LPnPolarity 0) +* ExtSupply2Bypass = ExtSupply12LPn ball is 0 when Ena is 0 +* ExtSupply3Bypass = ExtSupply3LPn ball is 0 when Ena is 0 +*/ +INIT_REGULATOR_REGISTER (AB8505_EXTSUPPLYREGU ,0xff ,0x30 ), +/* +* Vaux1Regu = force HP +* Vaux2Regu = force off +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUX12REGU ,0x0f ,0x01 ), +/* +* Vaux3Regu = force off +*/ +INIT_REGULATOR_REGISTER (AB8505_VRF1VAUX3REGU ,0x03 ,0x00 ), +/* +* VsmpsASel1 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSASEL1 ,0x00 ,0x00 ), +/* +* VsmpsASel2 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSASEL2 ,0x00 ,0x00 ), +/* +* VsmpsASel3 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSASEL3 ,0x00 ,0x00 ), +/* +* VsmpsBSel1 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSBSEL1 ,0x00 ,0x00 ), +/* +* VsmpsBSel2 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSBSEL2 ,0x00 ,0x00 ), +/* +* VsmpsBSel3 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSMPSBSEL3 ,0x00 ,0x00 ), +/* +* VsafeSel1 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSAFESEL1 ,0x00 ,0x00 ), +/* +* VsafeSel2 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSAFESEL2 ,0x00 ,0x00 ), +/* +* VsafeSel3 +*/ +INIT_REGULATOR_REGISTER (AB8505_VSAFESEL3 ,0x00 ,0x00 ), +/* +* Vaux1Sel = 2.8 V +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUX1SEL ,0x0f ,0x0C ), +/* +* Vaux2Sel = 2.9 V +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUX2SEL ,0x0f ,0x0d ), +/* +* Vaux3Sel = 2.91 V +*/ +INIT_REGULATOR_REGISTER (AB8505_VRF1VAUX3SEL ,0x07 ,0x07 ), +/* +* Vaux4RequestCtrl +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUX4REQCTRL ,0x00 ,0x00 ), +/* +* Vaux4Regu +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUX4REGU ,0x00 ,0x00 ), +/* +* Vaux4Sel +*/ +INIT_REGULATOR_REGISTER (AB8505_VAUX4SEL ,0x00 ,0x00 ), +/* +* Vaux1Disch = short discharge time +* Vaux2Disch = short discharge time +* Vaux3Disch = short discharge time +* Vintcore12Disch = short discharge time +* VTVoutDisch = short discharge time +* VaudioDisch = short discharge time +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUCTRLDISCH ,0xfc ,0x00 ), +/* +* VanaDisch = short discharge time +* Vaux8PullDownEna = pulldown disabled when Vaux8 is disabled +* Vaux8Disch = short discharge time +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUCTRLDISCH2 ,0x16 ,0x00 ), +/* +* Vaux4Disch = short discharge time +*/ +INIT_REGULATOR_REGISTER (AB8505_REGUCTRLDISCH3 ,0x01 ,0x00 ), +/* +* Vaux5Sel +* Vaux5LP +* Vaux5Ena +* Vaux5Disch +* Vaux5DisSfst +* Vaux5DisPulld +*/ +INIT_REGULATOR_REGISTER (AB8505_CTRLVAUX5 ,0x00 ,0x00 ), +/* +* Vaux6Sel +* Vaux6LP +* Vaux6Ena +* Vaux6DisPulld +*/ +INIT_REGULATOR_REGISTER (AB8505_CTRLVAUX6 ,0x00 ,0x00 ), +}; + +struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS ] = { +/* supplies to the display/camera */ + [AB8505_LDO_AUX1 ] = { + .constraints = { + .name ="V-DISPLAY" , + .min_uV =2800000 , + .max_uV =3300000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS , + .boot_on =1 ,/* display is on at boot */ + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vaux1_consumers), + .consumer_supplies = ab8500_vaux1_consumers, + }, +/* supplies to the on-board eMMC */ + [AB8505_LDO_AUX2 ] = { + .constraints = { + .name ="V-eMMC1" , + .min_uV =1100000 , + .max_uV =3300000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vaux2_consumers), + .consumer_supplies = ab8500_vaux2_consumers, + }, +/* supply for VAUX3, supplies to SDcard slots */ + [AB8505_LDO_AUX3 ] = { + .constraints = { + .name ="V-MMC-SD" , + .min_uV =1100000 , + .max_uV =3300000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vaux3_consumers), + .consumer_supplies = ab8500_vaux3_consumers, + }, +/* supply for VAUX4, supplies to NFC and standalone secure element */ + [AB8505_LDO_AUX4 ] = { + .constraints = { + .name ="V-NFC-SE" , + .min_uV =1100000 , + .max_uV =3300000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8505_vaux4_consumers), + .consumer_supplies = ab8505_vaux4_consumers, + }, +/* supply for VAUX5, supplies to TBD */ + [AB8505_LDO_AUX5 ] = { + .constraints = { + .name ="V-AUX5" , + .min_uV =1050000 , + .max_uV =2790000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8505_vaux5_consumers), + .consumer_supplies = ab8505_vaux5_consumers, + }, +/* supply for VAUX6, supplies to TBD */ + [AB8505_LDO_AUX6 ] = { + .constraints = { + .name ="V-AUX6" , + .min_uV =1050000 , + .max_uV =2790000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8505_vaux6_consumers), + .consumer_supplies = ab8505_vaux6_consumers, + }, +/* supply for gpadc, ADC LDO */ + [AB8505_LDO_ADC ] = { + .constraints = { + .name ="V-ADC" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8505_vadc_consumers), + .consumer_supplies = ab8505_vadc_consumers, + }, +/* supply for ab8500-vaudio, VAUDIO LDO */ + [AB8505_LDO_AUDIO ] = { + .constraints = { + .name ="V-AUD" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vaud_consumers), + .consumer_supplies = ab8500_vaud_consumers, + }, +/* supply for v-anamic1 VAMic1-LDO */ + [AB8505_LDO_ANAMIC1 ] = { + .constraints = { + .name ="V-AMIC1" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vamic1_consumers), + .consumer_supplies = ab8500_vamic1_consumers, + }, +/* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */ + [AB8505_LDO_ANAMIC2 ] = { + .constraints = { + .name ="V-AMIC2" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vamic2_consumers), + .consumer_supplies = ab8500_vamic2_consumers, + }, +/* supply for v-aux8, VAUX8 LDO */ + [AB8505_LDO_AUX8 ] = { + .constraints = { + .name ="V-AUX8" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8505_vaux8_consumers), + .consumer_supplies = ab8505_vaux8_consumers, + }, +/* supply for v-intcore12, VINTCORE12 LDO */ + [AB8505_LDO_INTCORE ] = { + .constraints = { + .name ="V-INTCORE" , + .min_uV =1250000 , + .max_uV =1350000 , + .input_uV =1800000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE | +REGULATOR_CHANGE_DRMS , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vintcore_consumers), + .consumer_supplies = ab8500_vintcore_consumers, + }, +/* supply for LDO USB */ + [AB8505_LDO_USB ] = { + .constraints = { + .name ="V-USB" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_MODE , + .valid_modes_mask =REGULATOR_MODE_NORMAL | +REGULATOR_MODE_IDLE , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8505_usb_consumers), + .consumer_supplies = ab8505_usb_consumers, + }, +/* supply for U8500 CSI-DSI, VANA LDO */ + [AB8505_LDO_ANA ] = { + .constraints = { + .name ="V-CSI-DSI" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (ab8500_vana_consumers), + .consumer_supplies = ab8500_vana_consumers, + }, +}; +struct ab8500_regulator_platform_data ab8500_regulator_plat_data = { .reg_init = ab8500_reg_init, .num_reg_init =ARRAY_SIZE (ab8500_reg_init),
@@ -481,18 +952,39 @@ struct ab8500_regulator_platform_data ab8500_regulator_plat_data = { .num_ext_regulator = ARRAY_SIZE(ab8500_ext_regulators), }; +/* Use the AB8500 init settings for AB8505 as they are the same right now */ +struct ab8500_regulator_platform_data ab8505_regulator_plat_data = { + .reg_init = ab8505_reg_init, + .num_reg_init =ARRAY_SIZE (ab8505_reg_init), + .regulator = ab8505_regulators, + .num_regulator =ARRAY_SIZE (ab8505_regulators), +}; +static void ab8500_modify_reg_init (int id,u8 mask,u8 value) {int i; -for (i =ARRAY_SIZE (ab8500_reg_init) -1 ; i >=0 ; i--) { -if (ab8500_reg_init[i].id == id) { -u8 initval = ab8500_reg_init[i].value; - initval = (initval & ~mask) | (value & mask); - ab8500_reg_init[i].value = initval; +if (cpu_is_u8520 ()) { +for (i =ARRAY_SIZE (ab8505_reg_init) -1 ; i >=0 ; i--) { +if (ab8505_reg_init[i].id == id) { +u8 initval = ab8505_reg_init[i].value; + initval = (initval & ~mask) | (value & mask); + ab8505_reg_init[i].value = initval; -BUG_ON (mask & ~ab8500_reg_init[i].mask); -return ; +BUG_ON (mask & ~ab8505_reg_init[i].mask); +return ; + } + } + }else { +for (i =ARRAY_SIZE (ab8500_reg_init) -1 ; i >=0 ; i--) { +if (ab8500_reg_init[i].id == id) { +u8 initval = ab8500_reg_init[i].value; + initval = (initval & ~mask) | (value & mask); + ab8500_reg_init[i].value = initval; + +BUG_ON (mask & ~ab8500_reg_init[i].mask); +return ; + } } }
@@ -514,6 +1006,11 @@ void mop500_regulator_init(void) regulator->constraints.state_standby.disabled =1 ; } +if (cpu_is_u8520 ()) { +/* Vaux2 initialized to be on */ +ab8500_modify_reg_init (AB8505_VAUX12REGU ,0x0f ,0x05 ); + } +/* * Handle AB8500_EXT_SUPPLY2 on HREFP_V20_V50 boards (do it for * all HREFP_V20 boards)
arch/arm/mach-ux500/board-mop500-regulators.h +1 -0
@@ -15,6 +15,7 @@#include <linux/regulator/ab8500.h> extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data; +extern struct ab8500_regulator_platform_data ab8505_regulator_plat_data;extern struct regulator_init_data tps61052_regulator;extern struct regulator_init_data gpio_en_3v3_regulator;
drivers/regulator/ab8500.c +616 -0
668 lines not on this page · raw message
include/linux/regulator/ab8500.h +73 -2
99 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 28/49 ARM: ux500: regulator: Use device IDs instead of device names
In reply to Lee JonesRemove device name from sensor platform data and change regulator names according to device name.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +4 -4
@@ -67,17 +67,17 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {REGULATOR_SUPPLY ("vcc" ,"2-0029" ),/* lsm303dlh accelerometer */ REGULATOR_SUPPLY ("vdd" ,"3-0018" ), +/* lsm303dlhc accelerometer */ +REGULATOR_SUPPLY ("vdd" ,"2-0019" ),/* lsm303dlh magnetometer */ -REGULATOR_SUPPLY ("vdd" ,"3-001e" ), +REGULATOR_SUPPLY ("vdd" ,"2-001e" ),/* Rohm BU21013 Touchscreen devices */ REGULATOR_SUPPLY ("avdd" ,"3-005c" ),REGULATOR_SUPPLY ("avdd" ,"3-005d" ),/* Synaptics RMI4 Touchscreen device */ REGULATOR_SUPPLY ("vdd" ,"3-004b" ),/* L3G4200D Gyroscope device */ -REGULATOR_SUPPLY ("vdd" ,"l3g4200d" ), -/* Proximity and Hal sensor device */ -REGULATOR_SUPPLY ("vdd" ,"sensor1p.0" ), +REGULATOR_SUPPLY ("vdd" ,"2-0068" ),/* Ambient light sensor device */ REGULATOR_SUPPLY("vdd", "3-0029"),/* Pressure sensor device */
Signature · 1 line
1.7.9.5
Re: [PATCH 28/49] ARM: ux500: regulator: Use device IDs instead of device names
Quoted 4 lines · Lee Jones
Remove device name from sensor platform data and change regulator names according to device name.
Signed-off-by Lee Jones <[email protected]>
Ugh...
arch/arm/mach-ux500/board-mop500-regulators.c static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { · line 80
Quoted 5 lines
/* L3G4200D Gyroscope device */arch/arm/mach-ux500/board-mop500-regulators.c +1
-3-REGULATOR_SUPPLY ("vdd" ,"l3g4200d" ), -/* Proximity and Hal sensor device */ - REGULATOR_SUPPLY("vdd", "sensor1p.0"), + REGULATOR_SUPPLY("vdd", "2-0068"),
Didn't you just add that supply with the funny name in that other patch I complained about.... Please merge them into one patch.
Yours,
Linus Walleij
Re: [PATCH 28/49] ARM: ux500: regulator: Use device IDs instead of device names
Quoted 7 lines · Linus Walleij
arch/arm/mach-ux500/board-mop500-regulators.c static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { · line 80
Quoted 2 lines · Lee Jones
arch/arm/mach-ux500/board-mop500-regulators.c +1
-1- REGULATOR_SUPPLY("vdd", "sensor1p.0"), + REGULATOR_SUPPLY("vdd", "2-0068"),Didn't you just add that supply with the funny name in that other patch I complained about.... Please merge them into one patch.
See also the patches I squashed down yesterday - it'd really help if these bugfixes could just get squashed into the original patches when there's no complex interdependencies in the way.
PATCH 29/49 regulator: ab8500-ext: Add support for AB9540 regulators
In reply to Lee JonesFrom: Michel JAOUEN <[email protected]>
Add the support for ab9540 external regulators.
--- drivers/regulator/ab8500-ext.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/regulator/ab8500-ext.c +24 -0
@@ -298,6 +298,16 @@ static struct regulator_ops ab8500_ext_regulator_ops = { .list_voltage = ab8500_ext_list_voltage, }; +static struct regulator_ops ab9540_ext_regulator_ops = { + .enable = ab8500_ext_regulator_enable, + .disable = ab8500_ext_regulator_disable, + .is_enabled = ab8500_ext_regulator_is_enabled, + .set_mode = ab8500_ext_regulator_set_mode, + .get_mode = ab8500_ext_regulator_get_mode, + .get_voltage = ab8500_ext_fixed_get_voltage, + .list_voltage = ab8500_ext_list_voltage, +}; +static struct ab8500_ext_regulator_info ab8500_ext_regulator_info[AB8500_NUM_EXT_REGULATORS ] = { [AB8500_EXT_SUPPLY1 ] = {
@@ -406,6 +416,20 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) info->cfg = (struct ab8500_ext_regulator_cfg *) pdata->ext_regulator[i].driver_data; +if (is_ab9540 (ab8500)) { +if (info->desc.id ==AB8500_EXT_SUPPLY1 ) { + info->desc.ops = &ab9540_ext_regulator_ops; + info->fixed_uV =4500000 ; + } +if (info->desc.id ==AB8500_EXT_SUPPLY2 ) + info->desc.ops = &ab9540_ext_regulator_ops; + +if (info->desc.id ==AB8500_EXT_SUPPLY3 ) { + info->desc.ops = &ab9540_ext_regulator_ops; + info->fixed_uV =3300000 ; + } + } +/* register regulator with framework */ info->rdev =regulator_register (&info->desc, &pdev->dev, &pdata->ext_regulator[i], info,NULL );
Signature · 1 line
1.7.9.5
PATCH 30/49 regulator: ab8500: Add support for the ab8540
In reply to Lee JonesTo obtain full AB8540 regulator support, the AB8500 regulator driver first needs to know its register layout and their initialisation values for each. That information is provided via a couple of large data structures which we provide here.
--- drivers/regulator/ab8500.c | 685 +++++++++++++++++++++++++++++++++++++- include/linux/regulator/ab8500.h | 86 +++++ 2 files changed, 763 insertions(+), 8 deletions(-)
drivers/regulator/ab8500.c +677 -8
@@ -109,6 +109,18 @@ static const int ldo_vaux56_voltages[] = { 2790000, }; +static const int ldo_vaux3_ab8540_voltages[] = { +1200000 , +1500000 , +1800000 , +2100000 , +2500000 , +2750000 , +2790000 , +2910000 , +3050000 , +}; +static const unsigned int ldo_vintcore_voltages[] = {1200000 ,1225000 ,
@@ -119,6 +131,17 @@ static const unsigned int ldo_vintcore_voltages[] = { 1350000, }; +static const int ldo_sdio_voltages[] = { +1160000 , +1050000 , +1100000 , +1500000 , +1800000 , +2200000 , +2910000 , +3050000 , +}; +static int ab8500_regulator_enable (struct regulator_dev *rdev) {int ret;
@@ -716,10 +739,10 @@ static struct ab8500_regulator_info/* values for CtrlVaux5 register */ .update_bank = 0x01, .update_reg = 0x55, - .update_mask = 0x08, - .update_val = 0x00, - .update_val_idle = 0x01, - .update_val_normal = 0x00, + .update_mask = 0x18, + .update_val = 0x10, + .update_val_idle = 0x18, + .update_val_normal = 0x10, .voltage_bank = 0x01, .voltage_reg = 0x55, .voltage_mask = 0x07,
@@ -741,10 +764,10 @@ static struct ab8500_regulator_info/* values for CtrlVaux6 register */ .update_bank = 0x01, .update_reg = 0x56, - .update_mask = 0x08, - .update_val = 0x00, - .update_val_idle = 0x01, - .update_val_normal = 0x00, + .update_mask = 0x18, + .update_val = 0x10, + .update_val_idle = 0x18, + .update_val_normal = 0x10, .voltage_bank = 0x01, .voltage_reg = 0x56, .voltage_mask = 0x07,
@@ -1158,6 +1181,254 @@ static struct ab8500_regulator_info }, }; +/* AB8540 regulator information */ +static struct ab8500_regulator_info + ab8540_regulator_info[AB8540_NUM_REGULATORS ] = { +/* +* Variable Voltage Regulators +* name, min mV, max mV, +* update bank, reg, mask, enable val +* volt bank, reg, mask, table, table length +*/ + [AB8540_LDO_AUX1 ] = { + .desc = { + .name ="LDO-AUX1" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUX1 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vauxn_voltages), + }, + .load_lp_uA =5000 , + .update_bank =0x04 , + .update_reg =0x09 , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , + .voltage_bank =0x04 , + .voltage_reg =0x1f , + .voltage_mask =0x0f , + .voltages = ldo_vauxn_voltages, + .voltages_len =ARRAY_SIZE (ldo_vauxn_voltages), + }, + [AB8540_LDO_AUX2 ] = { + .desc = { + .name ="LDO-AUX2" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUX2 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vauxn_voltages), + }, + .load_lp_uA =5000 , + .update_bank =0x04 , + .update_reg =0x09 , + .update_mask =0x0c , + .update_val =0x04 , + .update_val_idle =0x0c , + .update_val_normal =0x04 , + .voltage_bank =0x04 , + .voltage_reg =0x20 , + .voltage_mask =0x0f , + .voltages = ldo_vauxn_voltages, + .voltages_len =ARRAY_SIZE (ldo_vauxn_voltages), + }, + [AB8540_LDO_AUX3 ] = { + .desc = { + .name ="LDO-AUX3" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUX3 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vaux3_ab8540_voltages), + }, + .load_lp_uA =5000 , + .update_bank =0x04 , + .update_reg =0x0a , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , + .voltage_bank =0x04 , + .voltage_reg =0x21 , + .voltage_mask =0x07 , + .voltages = ldo_vaux3_ab8540_voltages, + .voltages_len =ARRAY_SIZE (ldo_vaux3_ab8540_voltages), + }, + [AB8540_LDO_AUX4 ] = { + .desc = { + .name ="LDO-AUX4" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB9540_LDO_AUX4 , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vauxn_voltages), + }, + .load_lp_uA =5000 , +/* values for Vaux4Regu register */ + .update_bank =0x04 , + .update_reg =0x2e , + .update_mask =0x03 , + .update_val =0x01 , + .update_val_idle =0x03 , + .update_val_normal =0x01 , +/* values for Vaux4SEL register */ + .voltage_bank =0x04 , + .voltage_reg =0x2f , + .voltage_mask =0x0f , + .voltages = ldo_vauxn_voltages, + .voltages_len =ARRAY_SIZE (ldo_vauxn_voltages), + }, + [AB8540_LDO_INTCORE ] = { + .desc = { + .name ="LDO-INTCORE" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_INTCORE , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_vintcore_voltages), + }, + .load_lp_uA =5000 , + .update_bank =0x03 , + .update_reg =0x80 , + .update_mask =0x44 , + .update_val =0x44 , + .update_val_idle =0x44 , + .update_val_normal =0x04 , + .voltage_bank =0x03 , + .voltage_reg =0x80 , + .voltage_mask =0x38 , + .voltages = ldo_vintcore_voltages, + .voltages_len =ARRAY_SIZE (ldo_vintcore_voltages), + }, + +/* +* Fixed Voltage Regulators +* name, fixed mV, +* update bank, reg, mask, enable val +*/ + [AB8540_LDO_TVOUT ] = { + .desc = { + .name ="LDO-TVOUT" , + .ops = &ab8500_regulator_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_TVOUT , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .delay =10000 , + .load_lp_uA =1000 , + .update_bank =0x03 , + .update_reg =0x80 , + .update_mask =0x82 , + .update_val =0x02 , + .update_val_idle =0x82 , + .update_val_normal =0x02 , + }, + [AB8540_LDO_AUDIO ] = { + .desc = { + .name ="LDO-AUDIO" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_AUDIO , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x02 , + .update_val =0x02 , + }, + [AB8540_LDO_ANAMIC1 ] = { + .desc = { + .name ="LDO-ANAMIC1" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_ANAMIC1 , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x08 , + .update_val =0x08 , + }, + [AB8540_LDO_ANAMIC2 ] = { + .desc = { + .name ="LDO-ANAMIC2" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_ANAMIC2 , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x10 , + .update_val =0x10 , + }, + [AB8540_LDO_DMIC ] = { + .desc = { + .name ="LDO-DMIC" , + .ops = &ab8500_regulator_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_DMIC , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .update_bank =0x03 , + .update_reg =0x83 , + .update_mask =0x04 , + .update_val =0x04 , + }, + +/* +* Regulators with fixed voltage and normal/idle modes +*/ + [AB8540_LDO_ANA ] = { + .desc = { + .name ="LDO-ANA" , + .ops = &ab8500_regulator_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8500_LDO_ANA , + .owner =THIS_MODULE , + .n_voltages =1 , + }, + .load_lp_uA =1000 , + .update_bank =0x04 , + .update_reg =0x06 , + .update_mask =0x0c , + .update_val =0x04 , + .update_val_idle =0x0c , + .update_val_normal =0x04 , + }, + [AB8540_LDO_SDIO ] = { + .desc = { + .name ="LDO-SDIO" , + .ops = &ab8500_regulator_volt_mode_ops, + .type =REGULATOR_VOLTAGE , + .id =AB8540_LDO_SDIO , + .owner =THIS_MODULE , + .n_voltages =ARRAY_SIZE (ldo_sdio_voltages), + }, + .min_uV =1050000 , + .max_uV =3050000 , + .load_lp_uA =5000 , + .update_bank =0x03 , + .update_reg =0x88 , + .update_mask =0x30 , + .update_val =0x10 , + .update_val_idle =0x00 , + .update_val_normal =0x20 , + .voltage_bank =0x03 , + .voltage_reg =0x88 , + .voltage_mask =0x07 , + .voltages = ldo_sdio_voltages, + .voltages_len =ARRAY_SIZE (ldo_sdio_voltages), + }, +}; +struct ab8500_reg_init {u8 bank;u8 addr;
@@ -1887,6 +2158,384 @@ static struct ab8500_reg_init ab9540_reg_init[] = { REG_INIT(AB9540_REGUCTRLDISCH3, 0x04, 0x48, 0x01), }; +/* AB8540 register init */ +static struct ab8500_reg_init ab8540_reg_init[] = { +/* +* 0x01, VSimSycClkReq1Valid +* 0x02, VSimSycClkReq2Valid +* 0x04, VSimSycClkReq3Valid +* 0x08, VSimSycClkReq4Valid +* 0x10, VSimSycClkReq5Valid +* 0x20, VSimSycClkReq6Valid +* 0x40, VSimSycClkReq7Valid +* 0x80, VSimSycClkReq8Valid +*/ +REG_INIT (AB8540_VSIMSYSCLKCTRL ,0x02 ,0x33 ,0xff ), +/* +* 0x03, VarmRequestCtrl +* 0x0c, VapeRequestCtrl +* 0x30, Vsmps1RequestCtrl +* 0xc0, Vsmps2RequestCtrl +*/ +REG_INIT (AB8540_REGUREQUESTCTRL1 ,0x03 ,0x03 ,0xff ), +/* +* 0x03, Vsmps3RequestCtrl +* 0x0c, VpllRequestCtrl +* 0x30, VanaRequestCtrl +* 0xc0, VextSupply1RequestCtrl +*/ +REG_INIT (AB8540_REGUREQUESTCTRL2 ,0x03 ,0x04 ,0xff ), +/* +* 0x03, VextSupply2RequestCtrl +* 0x0c, VextSupply3RequestCtrl +* 0x30, Vaux1RequestCtrl +* 0xc0, Vaux2RequestCtrl +*/ +REG_INIT (AB8540_REGUREQUESTCTRL3 ,0x03 ,0x05 ,0xff ), +/* +* 0x03, Vaux3RequestCtrl +* 0x04, SwHPReq +*/ +REG_INIT (AB8540_REGUREQUESTCTRL4 ,0x03 ,0x06 ,0x07 ), +/* +* 0x01, Vsmps1SysClkReq1HPValid +* 0x02, Vsmps2SysClkReq1HPValid +* 0x04, Vsmps3SysClkReq1HPValid +* 0x08, VanaSysClkReq1HPValid +* 0x10, VpllSysClkReq1HPValid +* 0x20, Vaux1SysClkReq1HPValid +* 0x40, Vaux2SysClkReq1HPValid +* 0x80, Vaux3SysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUSYSCLKREQ1HPVALID1 ,0x03 ,0x07 ,0xff ), +/* +* 0x01, VapeSysClkReq1HPValid +* 0x02, VarmSysClkReq1HPValid +* 0x04, VbbSysClkReq1HPValid +* 0x10, VextSupply1SysClkReq1HPValid +* 0x20, VextSupply2SysClkReq1HPValid +* 0x40, VextSupply3SysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUSYSCLKREQ1HPVALID2 ,0x03 ,0x08 ,0x77 ), +/* +* 0x01, Vsmps1HwHPReq1Valid +* 0x02, Vsmps2HwHPReq1Valid +* 0x04, Vsmps3HwHPReq1Valid +* 0x08, VanaHwHPReq1Valid +* 0x10, VpllHwHPReq1Valid +* 0x20, Vaux1HwHPReq1Valid +* 0x40, Vaux2HwHPReq1Valid +* 0x80, Vaux3HwHPReq1Valid +*/ +REG_INIT (AB8540_REGUHWHPREQ1VALID1 ,0x03 ,0x09 ,0xff ), +/* +* 0x01, VextSupply1HwHPReq1Valid +* 0x02, VextSupply2HwHPReq1Valid +* 0x04, VextSupply3HwHPReq1Valid +*/ +REG_INIT (AB8540_REGUHWHPREQ1VALID2 ,0x03 ,0x0a ,0x07 ), +/* +* 0x01, Vsmps1HwHPReq2Valid +* 0x02, Vsmps2HwHPReq2Valid +* 0x03, Vsmps3HwHPReq2Valid +* 0x08, VanaHwHPReq2Valid +* 0x10, VpllHwHPReq2Valid +* 0x20, Vaux1HwHPReq2Valid +* 0x40, Vaux2HwHPReq2Valid +* 0x80, Vaux3HwHPReq2Valid +*/ +REG_INIT (AB8540_REGUHWHPREQ2VALID1 ,0x03 ,0x0b ,0xff ), +/* +* 0x01, VextSupply1HwHPReq2Valid +* 0x02, VextSupply2HwHPReq2Valid +* 0x04, VextSupply3HwHPReq2Valid +*/ +REG_INIT (AB8540_REGUHWHPREQ2VALID2 ,0x03 ,0x0c ,0x07 ), +/* +* 0x01, VapeSwHPReqValid +* 0x02, VarmSwHPReqValid +* 0x04, Vsmps1SwHPReqValid +* 0x08, Vsmps2SwHPReqValid +* 0x10, Vsmps3SwHPReqValid +* 0x20, VanaSwHPReqValid +* 0x40, VpllSwHPReqValid +* 0x80, Vaux1SwHPReqValid +*/ +REG_INIT (AB8540_REGUSWHPREQVALID1 ,0x03 ,0x0d ,0xff ), +/* +* 0x01, Vaux2SwHPReqValid +* 0x02, Vaux3SwHPReqValid +* 0x04, VextSupply1SwHPReqValid +* 0x08, VextSupply2SwHPReqValid +* 0x10, VextSupply3SwHPReqValid +*/ +REG_INIT (AB8540_REGUSWHPREQVALID2 ,0x03 ,0x0e ,0x1f ), +/* +* 0x02, SysClkReq2Valid1 +* ... +* 0x80, SysClkReq8Valid1 +*/ +REG_INIT (AB8540_REGUSYSCLKREQVALID1 ,0x03 ,0x0f ,0xff ), +/* +* 0x02, SysClkReq2Valid2 +* ... +* 0x80, SysClkReq8Valid2 +*/ +REG_INIT (AB8540_REGUSYSCLKREQVALID2 ,0x03 ,0x10 ,0xff ), +/* +* 0x01, Vaux4SwHPReqValid +* 0x02, Vaux4HwHPReq2Valid +* 0x04, Vaux4HwHPReq1Valid +* 0x08, Vaux4SysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUVAUX4REQVALID ,0x03 ,0x11 ,0x0f ), +/* +* 0x01, Vaux5SwHPReqValid +* 0x02, Vaux5HwHPReq2Valid +* 0x04, Vaux5HwHPReq1Valid +* 0x08, Vaux5SysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUVAUX5REQVALID ,0x03 ,0x12 ,0x0f ), +/* +* 0x01, Vaux6SwHPReqValid +* 0x02, Vaux6HwHPReq2Valid +* 0x04, Vaux6HwHPReq1Valid +* 0x08, Vaux6SysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUVAUX6REQVALID ,0x03 ,0x13 ,0x0f ), +/* +* 0x01, VclkbSwHPReqValid +* 0x02, VclkbHwHPReq2Valid +* 0x04, VclkbHwHPReq1Valid +* 0x08, VclkbSysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUVCLKBREQVALID ,0x03 ,0x14 ,0x0f ), +/* +* 0x01, Vrf1SwHPReqValid +* 0x02, Vrf1HwHPReq2Valid +* 0x04, Vrf1HwHPReq1Valid +* 0x08, Vrf1SysClkReq1HPValid +*/ +REG_INIT (AB8540_REGUVRF1REQVALID ,0x03 ,0x15 ,0x0f ), +/* +* 0x02, VTVoutEna +* 0x04, Vintcore12Ena +* 0x38, Vintcore12Sel +* 0x40, Vintcore12LP +* 0x80, VTVoutLP +*/ +REG_INIT (AB8540_REGUMISC1 ,0x03 ,0x80 ,0xfe ), +/* +* 0x02, VaudioEna +* 0x04, VdmicEna +* 0x08, Vamic1Ena +* 0x10, Vamic2Ena +* 0x20, Vamic12LP +* 0xC0, VdmicSel +*/ +REG_INIT (AB8540_VAUDIOSUPPLY ,0x03 ,0x83 ,0xfe ), +/* +* 0x01, Vamic1_dzout +* 0x02, Vamic2_dzout +*/ +REG_INIT (AB8540_REGUCTRL1VAMIC ,0x03 ,0x84 ,0x03 ), +/* +* 0x07, VHSICSel +* 0x08, VHSICOffState +* 0x10, VHSIEna +* 0x20, VHSICLP +*/ +REG_INIT (AB8540_VHSIC ,0x03 ,0x87 ,0x3f ), +/* +* 0x07, VSDIOSel +* 0x08, VSDIOOffState +* 0x10, VSDIOEna +* 0x20, VSDIOLP +*/ +REG_INIT (AB8540_VSDIO ,0x03 ,0x88 ,0x3f ), +/* +* 0x03, Vsmps1Regu +* 0x0c, Vsmps1SelCtrl +* 0x10, Vsmps1AutoMode +* 0x20, Vsmps1PWMMode +*/ +REG_INIT (AB8540_VSMPS1REGU ,0x04 ,0x03 ,0x3f ), +/* +* 0x03, Vsmps2Regu +* 0x0c, Vsmps2SelCtrl +* 0x10, Vsmps2AutoMode +* 0x20, Vsmps2PWMMode +*/ +REG_INIT (AB8540_VSMPS2REGU ,0x04 ,0x04 ,0x3f ), +/* +* 0x03, Vsmps3Regu +* 0x0c, Vsmps3SelCtrl +* 0x10, Vsmps3AutoMode +* 0x20, Vsmps3PWMMode +* NOTE! PRCMU register +*/ +REG_INIT (AB8540_VSMPS3REGU ,0x04 ,0x05 ,0x0f ), +/* +* 0x03, VpllRegu +* 0x0c, VanaRegu +*/ +REG_INIT (AB8540_VPLLVANAREGU ,0x04 ,0x06 ,0x0f ), +/* +* 0x03, VextSupply1Regu +* 0x0c, VextSupply2Regu +* 0x30, VextSupply3Regu +* 0x40, ExtSupply2Bypass +* 0x80, ExtSupply3Bypass +*/ +REG_INIT (AB8540_EXTSUPPLYREGU ,0x04 ,0x08 ,0xff ), +/* +* 0x03, Vaux1Regu +* 0x0c, Vaux2Regu +*/ +REG_INIT (AB8540_VAUX12REGU ,0x04 ,0x09 ,0x0f ), +/* +* 0x0c, VRF1Regu +* 0x03, Vaux3Regu +*/ +REG_INIT (AB8540_VRF1VAUX3REGU ,0x04 ,0x0a ,0x0f ), +/* +* 0x3f, Vsmps1Sel1 +*/ +REG_INIT (AB8540_VSMPS1SEL1 ,0x04 ,0x13 ,0x3f ), +/* +* 0x3f, Vsmps1Sel2 +*/ +REG_INIT (AB8540_VSMPS1SEL2 ,0x04 ,0x14 ,0x3f ), +/* +* 0x3f, Vsmps1Sel3 +*/ +REG_INIT (AB8540_VSMPS1SEL3 ,0x04 ,0x15 ,0x3f ), +/* +* 0x3f, Vsmps2Sel1 +*/ +REG_INIT (AB8540_VSMPS2SEL1 ,0x04 ,0x17 ,0x3f ), +/* +* 0x3f, Vsmps2Sel2 +*/ +REG_INIT (AB8540_VSMPS2SEL2 ,0x04 ,0x18 ,0x3f ), +/* +* 0x3f, Vsmps2Sel3 +*/ +REG_INIT (AB8540_VSMPS2SEL3 ,0x04 ,0x19 ,0x3f ), +/* +* 0x7f, Vsmps3Sel1 +* NOTE! PRCMU register +*/ +REG_INIT (AB8540_VSMPS3SEL1 ,0x04 ,0x1b ,0x7f ), +/* +* 0x7f, Vsmps3Sel2 +* NOTE! PRCMU register +*/ +REG_INIT (AB8540_VSMPS3SEL2 ,0x04 ,0x1c ,0x7f ), +/* +* 0x0f, Vaux1Sel +*/ +REG_INIT (AB8540_VAUX1SEL ,0x04 ,0x1f ,0x0f ), +/* +* 0x0f, Vaux2Sel +*/ +REG_INIT (AB8540_VAUX2SEL ,0x04 ,0x20 ,0x0f ), +/* +* 0x07, Vaux3Sel +* 0x70, Vrf1Sel +*/ +REG_INIT (AB8540_VRF1VAUX3SEL ,0x04 ,0x21 ,0x77 ), +/* +* 0x01, VextSupply12LP +*/ +REG_INIT (AB8540_REGUCTRL2SPARE ,0x04 ,0x22 ,0x01 ), +/* +* 0x07, Vanasel +* 0x30, Vpllsel +*/ +REG_INIT (AB8540_VANAVPLLSEL ,0x04 ,0x29 ,0x37 ), +/* +* 0x03, Vaux4RequestCtrl +*/ +REG_INIT (AB8540_VAUX4REQCTRL ,0x04 ,0x2d ,0x03 ), +/* +* 0x03, Vaux4Regu +*/ +REG_INIT (AB8540_VAUX4REGU ,0x04 ,0x2e ,0x03 ), +/* +* 0x0f, Vaux4Sel +*/ +REG_INIT (AB8540_VAUX4SEL ,0x04 ,0x2f ,0x0f ), +/* +* 0x03, Vaux5RequestCtrl +*/ +REG_INIT (AB8540_VAUX5REQCTRL ,0x04 ,0x31 ,0x03 ), +/* +* 0x03, Vaux5Regu +*/ +REG_INIT (AB8540_VAUX5REGU ,0x04 ,0x32 ,0x03 ), +/* +* 0x3f, Vaux5Sel +*/ +REG_INIT (AB8540_VAUX5SEL ,0x04 ,0x33 ,0x3f ), +/* +* 0x03, Vaux6RequestCtrl +*/ +REG_INIT (AB8540_VAUX6REQCTRL ,0x04 ,0x34 ,0x03 ), +/* +* 0x03, Vaux6Regu +*/ +REG_INIT (AB8540_VAUX6REGU ,0x04 ,0x35 ,0x03 ), +/* +* 0x3f, Vaux6Sel +*/ +REG_INIT (AB8540_VAUX6SEL ,0x04 ,0x36 ,0x3f ), +/* +* 0x03, VCLKBRequestCtrl +*/ +REG_INIT (AB8540_VCLKBREQCTRL ,0x04 ,0x37 ,0x03 ), +/* +* 0x03, VCLKBRegu +*/ +REG_INIT (AB8540_VCLKBREGU ,0x04 ,0x38 ,0x03 ), +/* +* 0x07, VCLKBSel +*/ +REG_INIT (AB8540_VCLKBSEL ,0x04 ,0x39 ,0x07 ), +/* +* 0x03, Vrf1RequestCtrl +*/ +REG_INIT (AB8540_VRF1REQCTRL ,0x04 ,0x3a ,0x03 ), +/* +* 0x01, VpllDisch +* 0x02, Vrf1Disch +* 0x04, Vaux1Disch +* 0x08, Vaux2Disch +* 0x10, Vaux3Disch +* 0x20, Vintcore12Disch +* 0x40, VTVoutDisch +* 0x80, VaudioDisch +*/ +REG_INIT (AB8540_REGUCTRLDISCH ,0x04 ,0x43 ,0xff ), +/* +* 0x02, VanaDisch +* 0x04, VdmicPullDownEna +* 0x08, VpllPullDownEna +* 0x10, VdmicDisch +*/ +REG_INIT (AB8540_REGUCTRLDISCH2 ,0x04 ,0x44 ,0x1e ), +/* +* 0x01, Vaux4Disch +*/ +REG_INIT (AB8540_REGUCTRLDISCH3 ,0x04 ,0x48 ,0x01 ), +/* +* 0x01, Vaux5Disch +* 0x02, Vaux6Disch +* 0x04, VCLKBDisch +*/ +REG_INIT (AB8540_REGUCTRLDISCH4 ,0x04 ,0x49 ,0x07 ), +}; +static int ab8500_regulator_init_registers (struct platform_device *pdev,struct ab8500_reg_init *reg_init,int id,int mask,int value)
@@ -1993,6 +2642,21 @@ static struct of_regulator_match ab8505_regulator_match[] = { { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, }, }; +static struct of_regulator_match ab8540_regulator_match[] = { + { .name ="ab8500_ldo_aux1" , .driver_data = (void *)AB8540_LDO_AUX1 , }, + { .name ="ab8500_ldo_aux2" , .driver_data = (void *)AB8540_LDO_AUX2 , }, + { .name ="ab8500_ldo_aux3" , .driver_data = (void *)AB8540_LDO_AUX3 , }, + { .name ="ab8500_ldo_aux4" , .driver_data = (void *)AB8540_LDO_AUX4 , }, + { .name ="ab8500_ldo_intcore" , .driver_data = (void *)AB8540_LDO_INTCORE , }, + { .name ="ab8500_ldo_tvout" , .driver_data = (void *)AB8540_LDO_TVOUT , }, + { .name ="ab8500_ldo_audio" , .driver_data = (void *)AB8540_LDO_AUDIO , }, + { .name ="ab8500_ldo_anamic1" , .driver_data = (void *)AB8540_LDO_ANAMIC1 , }, + { .name ="ab8500_ldo_amamic2" , .driver_data = (void *)AB8540_LDO_ANAMIC2 , }, + { .name ="ab8500_ldo_dmic" , .driver_data = (void *)AB8540_LDO_DMIC , }, + { .name ="ab8500_ldo_ana" , .driver_data = (void *)AB8540_LDO_ANA , }, + { .name ="ab8500_ldo_sdio" , .driver_data = (void *)AB8540_LDO_SDIO , }, +}; +static struct of_regulator_match ab9540_regulator_match[] = { { .name ="ab9540_ldo_aux1" , .driver_data = (void *)AB9540_LDO_AUX1 , }, { .name ="ab9540_ldo_aux2" , .driver_data = (void *)AB9540_LDO_AUX2 , },
@@ -2052,6 +2716,11 @@ static int ab8500_regulator_probe(struct platform_device *pdev) regulator_info_size =ARRAY_SIZE (ab8505_regulator_info); reg_init = ab8505_reg_init; reg_init_size =AB8505_NUM_REGULATOR_REGISTERS ; + }else if (is_ab8540 (ab8500)) { + regulator_info = ab8540_regulator_info; + regulator_info_size =ARRAY_SIZE (ab8540_regulator_info); + reg_init = ab8540_reg_init; + reg_init_size =AB8540_NUM_REGULATOR_REGISTERS ; }else { regulator_info = ab8500_regulator_info; regulator_info_size =ARRAY_SIZE (ab8500_regulator_info);
include/linux/regulator/ab8500.h +86 -0
98 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 31/49 regulator: ab8500: Update voltage handling for fixed voltage regulators
In reply to Lee JonesThere are a few over-lapping methods for voltage selection operating in the AB8500 regulator driver currently. This patch removes unused, unnecessary variables from the regulator_info structures and provides voltage tables for those regulators which have fixed voltages.
--- drivers/regulator/ab8500.c | 89 ++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 48 deletions(-)
drivers/regulator/ab8500.c +41 -48
@@ -142,6 +142,26 @@ static const int ldo_sdio_voltages[] = { 3050000, }; +static const int fixed_1200000_voltage[] = { +1200000 , +}; + +static const int fixed_1800000_voltage[] = { +1800000 , +}; + +static const int fixed_2000000_voltage[] = { +2000000 , +}; + +static const int fixed_2050000_voltage[] = { +2050000 , +}; + +static const int fixed_3300000_voltage[] = { +3300000 , +}; +static int ab8500_regulator_enable (struct regulator_dev *rdev) {int ret;
@@ -400,7 +420,6 @@ static struct regulator_ops ab8500_regulator_mode_ops = { .get_optimum_mode = ab8500_regulator_get_optimum_mode, .set_mode = ab8500_regulator_set_mode, .get_mode = ab8500_regulator_get_mode, - .get_voltage_sel = ab8500_regulator_get_voltage_sel, .list_voltage = regulator_list_voltage_table, .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, };
@@ -409,7 +428,6 @@ static struct regulator_ops ab8500_regulator_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, .is_enabled = ab8500_regulator_is_enabled, - .get_voltage_sel = ab8500_regulator_get_voltage_sel, .list_voltage = regulator_list_voltage_table, };
@@ -521,7 +539,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_TVOUT, .owner = THIS_MODULE, .n_voltages = 1, - .min_uV = 2000000, + .volt_table = fixed_2000000_voltage, .enable_time = 500, }, .delay = 500,
@@ -541,7 +559,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, - .min_uV = 2000000, + .volt_table = fixed_2000000_voltage, }, .update_bank = 0x03, .update_reg = 0x83,
@@ -556,7 +574,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, - .min_uV = 2050000, + .volt_table = fixed_2050000_voltage, }, .update_bank = 0x03, .update_reg = 0x83,
@@ -571,7 +589,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, - .min_uV = 2050000, + .volt_table = fixed_2050000_voltage, }, .update_bank = 0x03, .update_reg = 0x83,
@@ -586,7 +604,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_DMIC, .owner = THIS_MODULE, .n_voltages = 1, - .min_uV = 1800000, + .volt_table = fixed_1800000_voltage, }, .update_bank = 0x03, .update_reg = 0x83,
@@ -605,7 +623,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, - .min_uV = 1200000, + .volt_table = fixed_1200000_voltage, }, .load_lp_uA = 1000, .update_bank = 0x04,
@@ -635,8 +653,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x09,
@@ -659,8 +675,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x09,
@@ -683,8 +697,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x0a,
@@ -707,8 +719,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000,/* values for Vaux4Regu register */ .update_bank = 0x04,
@@ -733,8 +743,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), }, - .min_uV = 1050000, - .max_uV = 2790000, .load_lp_uA = 2000,/* values for CtrlVaux5 register */ .update_bank = 0x01,
@@ -758,8 +766,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), }, - .min_uV = 1050000, - .max_uV = 2790000, .load_lp_uA = 2000,/* values for CtrlVaux6 register */ .update_bank = 0x01,
@@ -783,8 +789,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x03, .update_reg = 0x80,
@@ -812,9 +816,9 @@ static struct ab8500_regulator_info .id = AB8505_LDO_ADC, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2000000_voltage, }, .delay = 10000, - .fixed_uV = 2000000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -831,8 +835,8 @@ static struct ab8500_regulator_info .id = AB9540_LDO_USB, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_3300000_voltage, }, - .fixed_uV = 3300000, .update_bank = 0x03, .update_reg = 0x82, .update_mask = 0x03,
@@ -848,8 +852,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2000000_voltage, }, - .fixed_uV = 2000000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x02,
@@ -863,8 +867,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2050000_voltage, }, - .fixed_uV = 2050000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x08,
@@ -878,8 +882,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2050000_voltage, }, - .fixed_uV = 2050000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x10,
@@ -893,8 +897,8 @@ static struct ab8500_regulator_info .id = AB8505_LDO_AUX8, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_1800000_voltage, }, - .fixed_uV = 1800000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x04,
@@ -911,8 +915,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_1200000_voltage, }, - .fixed_uV = 1200000, .load_lp_uA = 1000, .update_bank = 0x04, .update_reg = 0x06,
@@ -941,8 +945,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x09,
@@ -965,8 +967,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x09,
@@ -989,8 +989,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x04, .update_reg = 0x0a,
@@ -1013,8 +1011,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000,/* values for Vaux4Regu register */ .update_bank = 0x04,
@@ -1039,8 +1035,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), }, - .min_uV = 1100000, - .max_uV = 3300000, .load_lp_uA = 5000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1068,9 +1062,9 @@ static struct ab8500_regulator_info .id = AB8500_LDO_TVOUT, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2000000_voltage, }, .delay = 10000, - .fixed_uV = 2000000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1087,8 +1081,8 @@ static struct ab8500_regulator_info .id = AB9540_LDO_USB, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_3300000_voltage, }, - .fixed_uV = 3300000, .update_bank = 0x03, .update_reg = 0x82, .update_mask = 0x03,
@@ -1104,8 +1098,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2000000_voltage, }, - .fixed_uV = 2000000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x02,
@@ -1119,8 +1113,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2050000_voltage, }, - .fixed_uV = 2050000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x08,
@@ -1134,8 +1128,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_2050000_voltage, }, - .fixed_uV = 2050000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x10,
@@ -1149,8 +1143,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_DMIC, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_1800000_voltage, }, - .fixed_uV = 1800000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x04,
@@ -1168,8 +1162,8 @@ static struct ab8500_regulator_info .id = AB8500_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, + .volt_table = fixed_1200000_voltage, }, - .fixed_uV = 1200000, .load_lp_uA = 1000, .load_lp_uA = 1000, .update_bank = 0x04,
@@ -1198,6 +1192,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -1412,8 +1407,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_sdio_voltages), }, - .min_uV = 1050000, - .max_uV = 3050000, .load_lp_uA = 5000, .update_bank = 0x03, .update_reg = 0x88,
Signature · 1 line
1.7.9.5
PATCH 32/49 regulator: ab8500: Delete useless fixed_uV field
In reply to Lee JonesFrom: Mustapha Ben Zoubeir <[email protected]>
The fixed_uV property residing in ab8500_ext_regulator_info is currently unused. We remove it here.
--- drivers/regulator/ab8500-ext.c | 45 ++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 25 deletions(-)
drivers/regulator/ab8500-ext.c +20 -25
@@ -30,7 +30,6 @@* @rdev: regulator device * @cfg: regulator configuration (extension of regulator FW configuration) * @is_enabled: status of regulator (on/off) -* @fixed_uV: typical voltage (for fixed voltage supplies) * @update_bank: bank to control on/off * @update_reg: register to control on/off * @update_mask: mask to enable/disable and set mode of regulator
@@ -48,7 +47,6 @@ struct ab8500_ext_regulator_info {struct regulator_dev *rdev;struct ab8500_ext_regulator_cfg *cfg;bool is_enabled; -int fixed_uV;u8 update_bank;u8 update_reg;u8 update_mask;
@@ -259,30 +257,33 @@ static unsigned int ab8500_ext_regulator_get_mode(struct regulator_dev *rdev)static int ab8500_ext_fixed_get_voltage (struct regulator_dev *rdev) { -struct ab8500_ext_regulator_info *info =rdev_get_drvdata (rdev); +struct regulation_constraints *regu_constraints = rdev->constraints; -if (info ==NULL ) { -dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +if (regu_constraints ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator constraints null pointer\n" );return -EINVAL ; } - -return info->fixed_uV; +if (regu_constraints->min_uV && regu_constraints->max_uV) { +if (regu_constraints->min_uV == regu_constraints->max_uV) +return regu_constraints->min_uV; + } +return -EINVAL ; }static int ab8500_ext_list_voltage (struct regulator_dev *rdev,unsigned selector) { -struct ab8500_ext_regulator_info *info =rdev_get_drvdata (rdev); +struct regulation_constraints *regu_constraints = rdev->constraints; -if (info ==NULL ) { -dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +if (regu_constraints ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator constraints null pointer\n" );return -EINVAL ; } -/* return the uV for the fixed regulators */ -if (info->fixed_uV) -return info->fixed_uV; - +if (regu_constraints->min_uV && regu_constraints->max_uV) { +if (regu_constraints->min_uV == regu_constraints->max_uV) +return regu_constraints->min_uV; + }return -EINVAL ; }
@@ -319,7 +320,6 @@ static struct ab8500_ext_regulator_info .owner = THIS_MODULE, .n_voltages = 1, }, - .fixed_uV = 1800000, .update_bank = 0x04, .update_reg = 0x08, .update_mask = 0x03,
@@ -337,7 +337,6 @@ static struct ab8500_ext_regulator_info .owner = THIS_MODULE, .n_voltages = 1, }, - .fixed_uV = 1360000, .update_bank = 0x04, .update_reg = 0x08, .update_mask = 0x0c,
@@ -355,7 +354,6 @@ static struct ab8500_ext_regulator_info .owner = THIS_MODULE, .n_voltages = 1, }, - .fixed_uV = 3400000, .update_bank = 0x04, .update_reg = 0x08, .update_mask = 0x30,
@@ -417,17 +415,14 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) pdata->ext_regulator[i].driver_data;if (is_ab9540 (ab8500)) { -if (info->desc.id ==AB8500_EXT_SUPPLY1 ) { +if (info->desc.id ==AB8500_EXT_SUPPLY1 ) info->desc.ops = &ab9540_ext_regulator_ops; - info->fixed_uV =4500000 ; - } -if (info->desc.id ==AB8500_EXT_SUPPLY2 ) - info->desc.ops = &ab9540_ext_regulator_ops; - -if (info->desc.id ==AB8500_EXT_SUPPLY3 ) { +if (info->desc.id ==AB8500_EXT_SUPPLY2 ) { info->desc.ops = &ab9540_ext_regulator_ops; - info->fixed_uV =3300000 ; + info->desc.n_voltages =0 ; } +if (info->desc.id ==AB8500_EXT_SUPPLY3 ) + info->desc.ops = &ab9540_ext_regulator_ops; }/* register regulator with framework */
Signature · 1 line
1.7.9.5
PATCH 33/49 regulator: ab8500: Use regulator_list_voltage_table()
In reply to Lee JonesFollowing a recent move to regulator_list_voltage_table() for all previous abx500 related platforms this converts all recent platform updates over too.
--- drivers/regulator/ab8500.c | 61 +++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 40 deletions(-)
drivers/regulator/ab8500.c +21 -40
@@ -98,7 +98,7 @@ static const unsigned int ldo_vaux3_voltages[] = { 2910000, }; -static const int ldo_vaux56_voltages[] = { +static const unsigned int ldo_vaux56_voltages[] = {1800000 ,1050000 ,1100000 ,
@@ -109,7 +109,7 @@ static const int ldo_vaux56_voltages[] = { 2790000, }; -static const int ldo_vaux3_ab8540_voltages[] = { +static const unsigned int ldo_vaux3_ab8540_voltages[] = {1200000 ,1500000 ,1800000 ,
@@ -131,7 +131,7 @@ static const unsigned int ldo_vintcore_voltages[] = { 1350000, }; -static const int ldo_sdio_voltages[] = { +static const unsigned int ldo_sdio_voltages[] = {1160000 ,1050000 ,1100000 ,
@@ -652,6 +652,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -663,8 +664,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x1f, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB8505_LDO_AUX2] = { .desc = {
@@ -674,6 +673,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -685,8 +685,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x20, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB8505_LDO_AUX3] = { .desc = {
@@ -696,6 +694,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), + .volt_table = ldo_vaux3_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -707,8 +706,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x21, .voltage_mask = 0x07, - .voltages = ldo_vaux3_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux3_voltages), }, [AB8505_LDO_AUX4] = { .desc = {
@@ -718,6 +715,7 @@ static struct ab8500_regulator_info .id = AB9540_LDO_AUX4, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000,/* values for Vaux4Regu register */
@@ -731,8 +729,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x2f, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB8505_LDO_AUX5] = { .desc = {
@@ -742,6 +738,7 @@ static struct ab8500_regulator_info .id = AB8505_LDO_AUX5, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), + .volt_table = ldo_vaux56_voltages, }, .load_lp_uA = 2000,/* values for CtrlVaux5 register */
@@ -754,8 +751,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x01, .voltage_reg = 0x55, .voltage_mask = 0x07, - .voltages = ldo_vaux56_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux56_voltages), }, [AB8505_LDO_AUX6] = { .desc = {
@@ -765,6 +760,7 @@ static struct ab8500_regulator_info .id = AB8505_LDO_AUX6, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), + .volt_table = ldo_vaux56_voltages, }, .load_lp_uA = 2000,/* values for CtrlVaux6 register */
@@ -777,8 +773,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x01, .voltage_reg = 0x56, .voltage_mask = 0x07, - .voltages = ldo_vaux56_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux56_voltages), }, [AB8505_LDO_INTCORE] = { .desc = {
@@ -788,6 +782,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), + .volt_table = ldo_vintcore_voltages, }, .load_lp_uA = 5000, .update_bank = 0x03,
@@ -799,8 +794,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x03, .voltage_reg = 0x80, .voltage_mask = 0x38, - .voltages = ldo_vintcore_voltages, - .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages), },/*
@@ -944,6 +937,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -955,8 +949,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x1f, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB9540_LDO_AUX2] = { .desc = {
@@ -966,6 +958,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -977,8 +970,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x20, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB9540_LDO_AUX3] = { .desc = {
@@ -988,6 +979,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), + .volt_table = ldo_vaux3_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -999,8 +991,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x21, .voltage_mask = 0x07, - .voltages = ldo_vaux3_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux3_voltages), }, [AB9540_LDO_AUX4] = { .desc = {
@@ -1010,6 +1000,7 @@ static struct ab8500_regulator_info .id = AB9540_LDO_AUX4, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000,/* values for Vaux4Regu register */
@@ -1023,8 +1014,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x2f, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB9540_LDO_INTCORE] = { .desc = {
@@ -1034,6 +1023,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), + .volt_table = ldo_vintcore_voltages, }, .load_lp_uA = 5000, .update_bank = 0x03,
@@ -1045,8 +1035,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x03, .voltage_reg = 0x80, .voltage_mask = 0x38, - .voltages = ldo_vintcore_voltages, - .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages), },/*
@@ -1204,8 +1192,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x1f, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB8540_LDO_AUX2] = { .desc = {
@@ -1215,6 +1201,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -1226,8 +1213,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x20, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB8540_LDO_AUX3] = { .desc = {
@@ -1237,6 +1222,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), + .volt_table = ldo_vaux3_ab8540_voltages, }, .load_lp_uA = 5000, .update_bank = 0x04,
@@ -1248,8 +1234,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x21, .voltage_mask = 0x07, - .voltages = ldo_vaux3_ab8540_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), }, [AB8540_LDO_AUX4] = { .desc = {
@@ -1259,6 +1243,7 @@ static struct ab8500_regulator_info .id = AB9540_LDO_AUX4, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), + .volt_table = ldo_vauxn_voltages, }, .load_lp_uA = 5000,/* values for Vaux4Regu register */
@@ -1272,8 +1257,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x2f, .voltage_mask = 0x0f, - .voltages = ldo_vauxn_voltages, - .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), }, [AB8540_LDO_INTCORE] = { .desc = {
@@ -1283,6 +1266,7 @@ static struct ab8500_regulator_info .id = AB8500_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), + .volt_table = ldo_vintcore_voltages, }, .load_lp_uA = 5000, .update_bank = 0x03,
@@ -1294,8 +1278,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x03, .voltage_reg = 0x80, .voltage_mask = 0x38, - .voltages = ldo_vintcore_voltages, - .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages), },/*
@@ -1405,7 +1387,8 @@ static struct ab8500_regulator_info .type = REGULATOR_VOLTAGE, .id = AB8540_LDO_SDIO, .owner = THIS_MODULE, - .n_voltages = ARRAY_SIZE(ldo_sdio_voltages), + .n_voltages = ARRAY_SIZE(ldo_sdio_voltages), + .volt_table = ldo_sdio_voltages, }, .load_lp_uA = 5000, .update_bank = 0x03,
@@ -1417,8 +1400,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x03, .voltage_reg = 0x88, .voltage_mask = 0x07, - .voltages = ldo_sdio_voltages, - .voltages_len = ARRAY_SIZE(ldo_sdio_voltages), }, };
Signature · 1 line
1.7.9.5
PATCH 34/49 regulator: ab8500: Fix vsdio parameters for AB8540 based platforms
In reply to Lee JonesFrom: Zhenhua HUANG <[email protected]>
Fix the parameters for vsdio in idle mode and normal mode.
--- drivers/regulator/ab8500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/ab8500.c +2 -2
@@ -1395,8 +1395,8 @@ static struct ab8500_regulator_info .update_reg = 0x88, .update_mask = 0x30, .update_val = 0x10, - .update_val_idle = 0x00, - .update_val_normal = 0x20, + .update_val_idle = 0x30, + .update_val_normal = 0x10, .voltage_bank = 0x03, .voltage_reg = 0x88, .voltage_mask = 0x07,
Signature · 1 line
1.7.9.5
PATCH 35/49 regulator: ab8500: Correct regulator id values
In reply to Lee JonesThe regulator id in the regulator info array should be the same values as the position of the element within the array. This patch fixes the mismatches.
--- drivers/regulator/ab8500.c | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-)
drivers/regulator/ab8500.c +31 -31
@@ -649,7 +649,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX1", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX1, + .id = AB8505_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -670,7 +670,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX2", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX2, + .id = AB8505_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -691,7 +691,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX3", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX3, + .id = AB8505_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), .volt_table = ldo_vaux3_voltages,
@@ -712,7 +712,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX4", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB9540_LDO_AUX4, + .id = AB8505_LDO_AUX4, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -779,7 +779,7 @@ static struct ab8500_regulator_info .name = "LDO-INTCORE", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_INTCORE, + .id = AB8505_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .volt_table = ldo_vintcore_voltages,
@@ -825,7 +825,7 @@ static struct ab8500_regulator_info .name = "LDO-USB", .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB9540_LDO_USB, + .id = AB8505_LDO_USB, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_3300000_voltage,
@@ -842,7 +842,7 @@ static struct ab8500_regulator_info .name = "LDO-AUDIO", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUDIO, + .id = AB8505_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage,
@@ -857,7 +857,7 @@ static struct ab8500_regulator_info .name = "LDO-ANAMIC1", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANAMIC1, + .id = AB8505_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2050000_voltage,
@@ -872,7 +872,7 @@ static struct ab8500_regulator_info .name = "LDO-ANAMIC2", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANAMIC2, + .id = AB8505_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2050000_voltage,
@@ -905,7 +905,7 @@ static struct ab8500_regulator_info .name = "LDO-ANA", .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANA, + .id = AB8505_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_1200000_voltage,
@@ -934,7 +934,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX1", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX1, + .id = AB9540_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -955,7 +955,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX2", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX2, + .id = AB9540_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -976,7 +976,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX3", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX3, + .id = AB9540_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), .volt_table = ldo_vaux3_voltages,
@@ -1020,7 +1020,7 @@ static struct ab8500_regulator_info .name = "LDO-INTCORE", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_INTCORE, + .id = AB9540_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .volt_table = ldo_vintcore_voltages,
@@ -1047,7 +1047,7 @@ static struct ab8500_regulator_info .name = "LDO-TVOUT", .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_TVOUT, + .id = AB9540_LDO_TVOUT, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage,
@@ -1083,7 +1083,7 @@ static struct ab8500_regulator_info .name = "LDO-AUDIO", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUDIO, + .id = AB9540_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage,
@@ -1098,7 +1098,7 @@ static struct ab8500_regulator_info .name = "LDO-ANAMIC1", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANAMIC1, + .id = AB9540_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2050000_voltage,
@@ -1113,7 +1113,7 @@ static struct ab8500_regulator_info .name = "LDO-ANAMIC2", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANAMIC2, + .id = AB9540_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2050000_voltage,
@@ -1128,7 +1128,7 @@ static struct ab8500_regulator_info .name = "LDO-DMIC", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_DMIC, + .id = AB9540_LDO_DMIC, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_1800000_voltage,
@@ -1147,7 +1147,7 @@ static struct ab8500_regulator_info .name = "LDO-ANA", .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANA, + .id = AB9540_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_1200000_voltage,
@@ -1177,7 +1177,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX1", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX1, + .id = AB8540_LDO_AUX1, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -1198,7 +1198,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX2", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX2, + .id = AB8540_LDO_AUX2, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -1219,7 +1219,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX3", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUX3, + .id = AB8540_LDO_AUX3, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), .volt_table = ldo_vaux3_ab8540_voltages,
@@ -1240,7 +1240,7 @@ static struct ab8500_regulator_info .name = "LDO-AUX4", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB9540_LDO_AUX4, + .id = AB8540_LDO_AUX4, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .volt_table = ldo_vauxn_voltages,
@@ -1263,7 +1263,7 @@ static struct ab8500_regulator_info .name = "LDO-INTCORE", .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_INTCORE, + .id = AB8540_LDO_INTCORE, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .volt_table = ldo_vintcore_voltages,
@@ -1290,7 +1290,7 @@ static struct ab8500_regulator_info .name = "LDO-TVOUT", .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_TVOUT, + .id = AB8540_LDO_TVOUT, .owner = THIS_MODULE, .n_voltages = 1, },
@@ -1308,7 +1308,7 @@ static struct ab8500_regulator_info .name = "LDO-AUDIO", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_AUDIO, + .id = AB8540_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, },
@@ -1322,7 +1322,7 @@ static struct ab8500_regulator_info .name = "LDO-ANAMIC1", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANAMIC1, + .id = AB8540_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, },
@@ -1336,7 +1336,7 @@ static struct ab8500_regulator_info .name = "LDO-ANAMIC2", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANAMIC2, + .id = AB8540_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, },
@@ -1350,7 +1350,7 @@ static struct ab8500_regulator_info .name = "LDO-DMIC", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_DMIC, + .id = AB8540_LDO_DMIC, .owner = THIS_MODULE, .n_voltages = 1, },
@@ -1368,7 +1368,7 @@ static struct ab8500_regulator_info .name = "LDO-ANA", .ops = &ab8500_regulator_mode_ops, .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_ANA, + .id = AB8540_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, },
Signature · 1 line
1.7.9.5
PATCH 36/49 regulator: ab8500: Don't register external regulators on AB8505
In reply to Lee JonesFrom: Rabin Vincent <[email protected]>
ExtSupply regulators are not included on AB8505 based platforms.
--- drivers/regulator/ab8500.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/regulator/ab8500.c +12 -8
@@ -2761,10 +2761,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev)return err; } -/* register external regulators (before Vaux1, 2 and 3) */ - err =ab8500_ext_regulator_init (pdev); -if (err) -return err; +if (!is_ab8505 (ab8500)) { +/* register external regulators (before Vaux1, 2 and 3) */ + err =ab8500_ext_regulator_init (pdev); +if (err) +return err; + }/* register all regulators */ for (i =0 ; i < regulator_info_size; i++) {
@@ -2806,10 +2808,12 @@ static int ab8500_regulator_remove(struct platform_device *pdev)regulator_unregister (info->regulator); } -/* remove external regulators (after Vaux1, 2 and 3) */ - err =ab8500_ext_regulator_exit (pdev); -if (err) -return err; +if (!is_ab8505 (ab8500)) { +/* remove external regulators (after Vaux1, 2 and 3) */ + err =ab8500_ext_regulator_exit (pdev); +if (err) +return err; + }/* remove regulator debug */ err =ab8500_regulator_debug_exit (pdev);
Signature · 1 line
1.7.9.5
PATCH 37/49 regulator: ab8500: Add voltage selection for AUDIO and ANA on AB8505
In reply to Lee Jones--- drivers/regulator/ab8500.c | 55 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 6 deletions(-)
drivers/regulator/ab8500.c +49 -6
@@ -162,6 +162,28 @@ static const int fixed_3300000_voltage[] = { 3300000, }; +static const int ldo_vana_voltages[] = { +1050000 , +1075000 , +1100000 , +1125000 , +1150000 , +1175000 , +1200000 , +1225000 , +}; + +static const int ldo_vaudio_voltages[] = { +2000000 , +2100000 , +2200000 , +2300000 , +2400000 , +2500000 , +2600000 , +2600000 ,/* Duplicated in Vaudio and IsoUicc Control register. */ +}; +static int ab8500_regulator_enable (struct regulator_dev *rdev) {int ret;
@@ -413,6 +435,16 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = { .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, }; +static struct regulator_ops ab8500_regulator_volt_ops = { + .enable = ab8500_regulator_enable, + .disable = ab8500_regulator_disable, + .is_enabled = ab8500_regulator_is_enabled, + .get_voltage_sel = ab8500_regulator_get_voltage_sel, + .set_voltage_sel = ab8500_regulator_set_voltage_sel, + .list_voltage = regulator_list_voltage_table, + .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, +}; +static struct regulator_ops ab8500_regulator_mode_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable,
@@ -840,17 +872,23 @@ static struct ab8500_regulator_info [AB8505_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_volt_ops, .type = REGULATOR_VOLTAGE, .id = AB8505_LDO_AUDIO, .owner = THIS_MODULE, - .n_voltages = 1, - .volt_table = fixed_2000000_voltage, + .n_voltages = ARRAY_SIZE(ldo_vaudio_voltages), + .volt_table = ldo_vaudio_voltages, }, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x02, .update_val = 0x02, + .voltage_bank = 0x01, + .voltage_reg = 0x57, + .voltage_mask = 0x7, + .voltage_shift = 4, + .voltages = ldo_vaudio_voltages, + .voltages_len = ARRAY_SIZE(ldo_vaudio_voltages), }, [AB8505_LDO_ANAMIC1] = { .desc = {
@@ -903,12 +941,12 @@ static struct ab8500_regulator_info [AB8505_LDO_ANA] = { .desc = { .name = "LDO-ANA", - .ops = &ab8500_regulator_mode_ops, + .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8505_LDO_ANA, .owner = THIS_MODULE, - .n_voltages = 1, - .volt_table = fixed_1200000_voltage, + .n_voltages = ARRAY_SIZE(ldo_vana_voltages), + .volt_table = ldo_vana_voltages, }, .load_lp_uA = 1000, .update_bank = 0x04,
@@ -917,6 +955,11 @@ static struct ab8500_regulator_info .update_val = 0x04, .update_val_idle = 0x0c, .update_val_normal = 0x04, + .voltage_bank = 0x04, + .voltage_reg = 0x29, + .voltage_mask = 0x7, + .voltages = ldo_vana_voltages, + .voltages_len = ARRAY_SIZE(ldo_vana_voltages), }, };
Signature · 1 line
1.7.9.5
PATCH 38/49 regulator: ab8500: Also check for AB8505 based platforms
In reply to Lee JonesFrom: "xiaomei.zhang" <[email protected]>
Ensure we initialise AB8505 external supply regulators.
--- drivers/regulator/ab8500-ext.c | 2 +- drivers/regulator/ab8500.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/regulator/ab8500-ext.c +1 -1
@@ -414,7 +414,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) info->cfg = (struct ab8500_ext_regulator_cfg *) pdata->ext_regulator[i].driver_data; -if (is_ab9540 (ab8500)) { +if ((is_ab9540 (ab8500)) || (is_ab8540 (ab8500))) {if (info->desc.id ==AB8500_EXT_SUPPLY1 ) info->desc.ops = &ab9540_ext_regulator_ops;if (info->desc.id ==AB8500_EXT_SUPPLY2 ) {
drivers/regulator/ab8500.c +3 -0
@@ -2836,6 +2836,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev) }else if (is_ab8505 (ab8500)) { regulator_info = ab8505_regulator_info; regulator_info_size =ARRAY_SIZE (ab8505_regulator_info); + }else if (is_ab8540 (ab8500)) { + regulator_info = ab8540_regulator_info; + regulator_info_size =ARRAY_SIZE (ab8540_regulator_info); }else { regulator_info = ab8500_regulator_info; regulator_info_size =ARRAY_SIZE (ab8500_regulator_info);
Signature · 1 line
1.7.9.5
PATCH 39/49 regulator: ab8500: Add new operations for Vaux3
In reply to Lee JonesFrom: "xiaomei.zhang" <[email protected]>
In former functions, only can set Vaux3 to 2.91V, because the highest bit of Vaux3 register is put into another register. So add new expanded functions for Vaux3's operation.
--- drivers/regulator/ab8500.c | 120 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 1 deletion(-)
drivers/regulator/ab8500.c +119 -1
@@ -65,6 +65,13 @@ struct ab8500_regulator_info {u8 voltage_mask;u8 voltage_shift;unsigned int delay; +struct { +u8 voltage_limit; +u8 voltage_bank; +u8 voltage_reg; +u8 voltage_mask; +u8 voltage_shift; + } expand_register; };/* voltage tables for the vauxn/vintcore supplies */
@@ -383,6 +390,57 @@ static int ab8500_regulator_get_voltage_sel(struct regulator_dev *rdev)return val >> info->voltage_shift; } +static int ab8540_aux3_regulator_get_voltage_sel (struct regulator_dev *rdev) +{ +int ret, val; +struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); +u8 regval, regval_expand; + +if (info ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +return -EINVAL ; + } + + ret =abx500_get_register_interruptible (info->dev, + info->voltage_bank, info->voltage_reg, ®val); + +if (ret <0 ) { +dev_err (rdev_get_dev (rdev), +"couldn't read voltage reg for regulator\n" ); +return ret; + } + + ret =abx500_get_register_interruptible (info->dev, + info->expand_register.voltage_bank, + info->expand_register.voltage_reg, ®val_expand); + +if (ret <0 ) { +dev_err (rdev_get_dev (rdev), +"couldn't read voltage reg for regulator\n" ); +return ret; + } + +dev_vdbg (rdev_get_dev (rdev), +"%s-get_voltage (bank, reg, mask, value): 0x%x, 0x%x, 0x%x," +" 0x%x\n" , + info->desc.name, info->voltage_bank, info->voltage_reg, + info->voltage_mask, regval); +dev_vdbg (rdev_get_dev (rdev), +"%s-get_voltage expand (bank, reg, mask, value): 0x%x, 0x%x, 0x%x," +" 0x%x\n" , + info->desc.name, info->expand_register.voltage_bank, + info->expand_register.voltage_reg, + info->expand_register.voltage_mask, regval_expand); + +if (regval_expand&(info->expand_register.voltage_mask)) +/* Vaux3 has a different layout */ + val = info->expand_register.voltage_limit; +else + val = (regval & info->voltage_mask) >> info->voltage_shift; + +return val; +} +static int ab8500_regulator_set_voltage_sel (struct regulator_dev *rdev,unsigned selector) {
@@ -413,6 +471,46 @@ static int ab8500_regulator_set_voltage_sel(struct regulator_dev *rdev,return ret; } +static int ab8540_aux3_regulator_set_voltage_sel (struct regulator_dev *rdev, +unsigned selector) +{ +int ret; +struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); +u8 regval; + +if (info ==NULL ) { +dev_err (rdev_get_dev (rdev),"regulator info null pointer\n" ); +return -EINVAL ; + } + +if (selector >= info->expand_register.voltage_limit) { +/* Vaux3 bit4 has different layout */ + regval = (u8 )selector << info->expand_register.voltage_shift; + ret =abx500_mask_and_set_register_interruptible (info->dev, + info->expand_register.voltage_bank, + info->expand_register.voltage_reg, + info->expand_register.voltage_mask, + regval); + }else { +/* set the registers for the request */ + regval = (u8 )selector << info->voltage_shift; + ret =abx500_mask_and_set_register_interruptible (info->dev, + info->voltage_bank, info->voltage_reg, + info->voltage_mask, regval); + } +if (ret <0 ) +dev_err (rdev_get_dev (rdev), +"couldn't set voltage reg for regulator\n" ); + +dev_vdbg (rdev_get_dev (rdev), +"%s-set_voltage (bank, reg, mask, value): 0x%x, 0x%x, 0x%x," +" 0x%x\n" , + info->desc.name, info->voltage_bank, info->voltage_reg, + info->voltage_mask, regval); + +return ret; +} +static int ab8500_regulator_set_voltage_time_sel (struct regulator_dev *rdev,unsigned int old_sel,unsigned int new_sel)
@@ -435,6 +533,19 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = { .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, }; +static struct regulator_ops ab8540_aux3_regulator_volt_mode_ops = { + .enable = ab8500_regulator_enable, + .disable = ab8500_regulator_disable, + .get_optimum_mode = ab8500_regulator_get_optimum_mode, + .set_mode = ab8500_regulator_set_mode, + .get_mode = ab8500_regulator_get_mode, + .is_enabled = ab8500_regulator_is_enabled, + .get_voltage_sel = ab8540_aux3_regulator_get_voltage_sel, + .set_voltage_sel = ab8540_aux3_regulator_set_voltage_sel, + .list_voltage = regulator_list_voltage_table, + .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, +}; +static struct regulator_ops ab8500_regulator_volt_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable,
@@ -1260,7 +1371,7 @@ static struct ab8500_regulator_info [AB8540_LDO_AUX3] = { .desc = { .name = "LDO-AUX3", - .ops = &ab8500_regulator_volt_mode_ops, + .ops = &ab8540_aux3_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8540_LDO_AUX3, .owner = THIS_MODULE,
@@ -1277,6 +1388,13 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x21, .voltage_mask = 0x07, + .expand_register = { + .voltage_limit = 8, + .voltage_bank = 0x04, + .voltage_reg = 0x01, + .voltage_mask = 0x10, + .voltage_shift = 1, + } }, [AB8540_LDO_AUX4] = { .desc = {
Signature · 1 line
1.7.9.5
PATCH 40/49 regulator: ab8500: Default value on LDO USB to HP
In reply to Lee JonesFrom: Mattias Wallin <[email protected]>
This patch change the default value on LDO USB to High Power since this is the normal execution mode.
--- drivers/regulator/ab8500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/ab8500.c +1 -1
@@ -931,7 +931,7 @@ static struct ab8500_regulator_info .update_bank = 0x03, .update_reg = 0x80, .update_mask = 0x44, - .update_val = 0x44, + .update_val = 0x04, .update_val_idle = 0x44, .update_val_normal = 0x04, .voltage_bank = 0x03,
Signature · 1 line
1.7.9.5
PATCH 41/49 regulator: ab8500: Add mode operation for v-amic
In reply to Lee Jonesv-amic1 and v-amic2 regulators have dedicated mode registers and share the same mode bit. This patch adds special handling for those regulators.
--- arch/arm/mach-ux500/board-mop500-regulators.c | 10 +- drivers/regulator/ab8500.c | 178 ++++++++++++++++++++++--- 2 files changed, 167 insertions(+), 21 deletions(-)
arch/arm/mach-ux500/board-mop500-regulators.c +8 -2
@@ -880,7 +880,10 @@ struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = { [AB8505_LDO_ANAMIC1] = { .constraints = { .name = "V-AMIC1", - .valid_ops_mask = REGULATOR_CHANGE_STATUS, + .valid_ops_mask =REGULATOR_CHANGE_STATUS | + REGULATOR_CHANGE_MODE, + .valid_modes_mask =REGULATOR_MODE_NORMAL | + REGULATOR_MODE_IDLE, }, .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic1_consumers), .consumer_supplies = ab8500_vamic1_consumers,
@@ -889,7 +892,10 @@ struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = { [AB8505_LDO_ANAMIC2] = { .constraints = { .name = "V-AMIC2", - .valid_ops_mask = REGULATOR_CHANGE_STATUS, + .valid_ops_mask =REGULATOR_CHANGE_STATUS | + REGULATOR_CHANGE_MODE, + .valid_modes_mask =REGULATOR_MODE_NORMAL | + REGULATOR_MODE_IDLE, }, .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic2_consumers), .consumer_supplies = ab8500_vamic2_consumers,
drivers/regulator/ab8500.c +159 -19
290 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 42/49 regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540
In reply to Lee JonesAdd voltage setting for vdmic; add LP mode setting for vamic1,2.
--- drivers/regulator/ab8500.c | 45 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-)
drivers/regulator/ab8500.c +40 -5
@@ -214,9 +214,18 @@ static const int ldo_vaudio_voltages[] = { 2600000, /* Duplicated in Vaudio and IsoUicc Control register. */ }; +static const int ldo_vdmic_voltages[] = { +1800000 , +1900000 , +2000000 , +2850000 , +}; +static DEFINE_MUTEX (shared_mode_mutex);static struct ab8500_shared_mode ldo_anamic1_shared;static struct ab8500_shared_mode ldo_anamic2_shared; +static struct ab8500_shared_mode ab8540_ldo_anamic1_shared; +static struct ab8500_shared_mode ab8540_ldo_anamic2_shared;static int ab8500_regulator_enable (struct regulator_dev *rdev) {
@@ -1131,7 +1140,7 @@ static struct ab8500_regulator_info .n_voltages = 1, .volt_table = fixed_2050000_voltage, }, - .shared_mode = &ldo_anamic1_shared, + .shared_mode = &ldo_anamic1_shared, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x08,
@@ -1613,44 +1622,62 @@ static struct ab8500_regulator_info [AB8540_LDO_ANAMIC1] = { .desc = { .name = "LDO-ANAMIC1", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_anamic_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8540_LDO_ANAMIC1, .owner = THIS_MODULE, .n_voltages = 1, }, + .shared_mode = &ab8540_ldo_anamic1_shared, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x08, .update_val = 0x08, + .mode_bank = 0x03, + .mode_reg = 0x83, + .mode_mask = 0x20, + .mode_val_idle = 0x20, + .mode_val_normal = 0x00, }, [AB8540_LDO_ANAMIC2] = { .desc = { .name = "LDO-ANAMIC2", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_anamic_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8540_LDO_ANAMIC2, .owner = THIS_MODULE, .n_voltages = 1, }, + .shared_mode = &ab8540_ldo_anamic2_shared, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x10, .update_val = 0x10, + .mode_bank = 0x03, + .mode_reg = 0x83, + .mode_mask = 0x20, + .mode_val_idle = 0x20, + .mode_val_normal = 0x00, }, [AB8540_LDO_DMIC] = { .desc = { .name = "LDO-DMIC", - .ops = &ab8500_regulator_ops, + .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8540_LDO_DMIC, .owner = THIS_MODULE, - .n_voltages = 1, + .n_voltages = ARRAY_SIZE(ldo_vdmic_voltages), }, + .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x04, .update_val = 0x04, + .voltage_bank = 0x03, + .voltage_reg = 0x83, + .voltage_mask = 0xc0, + .voltages = ldo_vdmic_voltages, + .voltages_len = ARRAY_SIZE(ldo_vdmic_voltages), },/*
@@ -1704,6 +1731,14 @@ static struct ab8500_shared_mode ldo_anamic2_shared = { .shared_regulator = &ab8505_regulator_info[AB8505_LDO_ANAMIC1], }; +static struct ab8500_shared_mode ab8540_ldo_anamic1_shared = { + .shared_regulator = &ab8540_regulator_info[AB8540_LDO_ANAMIC2 ], +}; + +static struct ab8500_shared_mode ab8540_ldo_anamic2_shared = { + .shared_regulator = &ab8540_regulator_info[AB8540_LDO_ANAMIC1 ], +}; +struct ab8500_reg_init {u8 bank;u8 addr;
Signature · 1 line
1.7.9.5
PATCH 43/49 regulator: ab8500-ext: Adapt regulator registration for newly changed API
In reply to Lee JonesFrom: Gabriel Fernandez <[email protected]>
Instead of using a long list of arguments for registering a new regulator, the API has changed to accommodate a new structure which is to contain the necessary runtime configuration. This patch allows the external regulator to follow suit and continue to successfully register itself with the Regulator subsystem.
--- drivers/regulator/ab8500-ext.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/regulator/ab8500-ext.c +7 -2
@@ -369,6 +369,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent);struct ab8500_platform_data *ppdata;struct ab8500_regulator_platform_data *pdata; +struct regulator_config config = { };int i, err;if (!ab8500) {
@@ -414,6 +415,10 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) info->cfg = (struct ab8500_ext_regulator_cfg *) pdata->ext_regulator[i].driver_data; + config.dev = &pdev->dev; + config.init_data = &pdata->ext_regulator[i]; + config.driver_data = info; +if ((is_ab9540 (ab8500)) || (is_ab8540 (ab8500))) {if (info->desc.id ==AB8500_EXT_SUPPLY1 ) info->desc.ops = &ab9540_ext_regulator_ops;
@@ -426,8 +431,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) }/* register regulator with framework */ - info->rdev =regulator_register (&info->desc, &pdev->dev, - &pdata->ext_regulator[i], info,NULL ); + info->rdev =regulator_register (&info->desc, &config); +if (IS_ERR (info->rdev)) { err =PTR_ERR (info->rdev); dev_err(&pdev->dev, "failed to register regulator %s\n",
Signature · 1 line
1.7.9.5
PATCH 44/49 regulator: ab8500: Use a struct to select the good regulator configuration
In reply to Lee JonesAt the probe use a structure to select the good regulator array from from ab9540, ab8505, ab8540 or ab8500 configuration.
--- drivers/regulator/ab8500.c | 135 +++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 71 deletions(-)
drivers/regulator/ab8500.c +64 -71
@@ -2846,10 +2846,19 @@ static struct ab8500_reg_init ab8540_reg_init[] = { REG_INIT(AB8540_REGUCTRLDISCH4, 0x04, 0x49, 0x07), }; +static struct { +struct ab8500_regulator_info *info; +int info_size; +struct ab8500_reg_init *init; +int init_size; +struct of_regulator_match *match; +int match_size; +} abx500_regulator; +static int ab8500_regulator_init_registers (struct platform_device *pdev, -struct ab8500_reg_init *reg_init,int id,int mask,int value) { +struct ab8500_reg_init *reg_init = abx500_regulator.init;int err;BUG_ON (value & ~mask);
@@ -2879,7 +2888,6 @@ static int ab8500_regulator_init_registers(struct platform_device *pdev,static int ab8500_regulator_register (struct platform_device *pdev,struct regulator_init_data *init_data, -struct ab8500_regulator_info *regulator_info,int id,struct device_node *np) {struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent);
@@ -2888,7 +2896,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,int err;/* assign per-regulator data */ - info = ®ulator_info[id]; + info = &abx500_regulator.info[id]; info->dev = &pdev->dev; config.dev = &pdev->dev;
@@ -2914,7 +2922,7 @@ static int ab8500_regulator_register(struct platform_device *pdev, info->desc.name);/* when we fail, un-register all earlier regulators */ while (--id >=0 ) { - info = ®ulator_info[id]; + info = &abx500_regulator.info[id];regulator_unregister (info->regulator); }return err;
@@ -2981,19 +2989,49 @@ static struct of_regulator_match ab9540_regulator_match[] = { { .name = "ab9540_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, }, }; +static void abx500_get_regulator_info (struct ab8500 *ab8500) +{ +if (is_ab9540 (ab8500)) { + abx500_regulator.info = ab9540_regulator_info; + abx500_regulator.info_size =ARRAY_SIZE (ab9540_regulator_info); + abx500_regulator.init = ab9540_reg_init; + abx500_regulator.init_size =AB9540_NUM_REGULATOR_REGISTERS ; + abx500_regulator.match = ab9540_regulator_match; + abx500_regulator.match_size =ARRAY_SIZE (ab9540_regulator_match); + }else if (is_ab8505 (ab8500)) { + abx500_regulator.info = ab8505_regulator_info; + abx500_regulator.info_size =ARRAY_SIZE (ab8505_regulator_info); + abx500_regulator.init = ab8505_reg_init; + abx500_regulator.init_size =AB8505_NUM_REGULATOR_REGISTERS ; + abx500_regulator.match = ab8505_regulator_match; + abx500_regulator.match_size =ARRAY_SIZE (ab8505_regulator_match); + }else if (is_ab8540 (ab8500)) { + abx500_regulator.info = ab8540_regulator_info; + abx500_regulator.info_size =ARRAY_SIZE (ab8540_regulator_info); + abx500_regulator.init = ab8540_reg_init; + abx500_regulator.init_size =AB8540_NUM_REGULATOR_REGISTERS ; + abx500_regulator.match = ab8540_regulator_match; + abx500_regulator.match_size =ARRAY_SIZE (ab8540_regulator_match); + }else { + abx500_regulator.info = ab8500_regulator_info; + abx500_regulator.info_size =ARRAY_SIZE (ab8500_regulator_info); + abx500_regulator.init = ab8500_reg_init; + abx500_regulator.init_size =AB8500_NUM_REGULATOR_REGISTERS ; + abx500_regulator.match = ab8500_regulator_match; + abx500_regulator.match_size =ARRAY_SIZE (ab8500_regulator_match); + } +} +static int ab8500_regulator_of_probe (struct platform_device *pdev, -struct ab8500_regulator_info *regulator_info, -int regulator_info_size, -struct of_regulator_match *match,struct device_node *np) { +struct of_regulator_match *match = abx500_regulator.match;int err, i; -for (i =0 ; i < regulator_info_size; i++) { +for (i =0 ; i < abx500_regulator.info_size; i++) { err =ab8500_regulator_register ( - pdev, match[i].init_data, regulator_info, - i, match[i].of_node); + pdev, match[i].init_data, i, match[i].of_node);if (err)return err; }
@@ -3005,59 +3043,31 @@ static int ab8500_regulator_probe(struct platform_device *pdev) {struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent);struct device_node *np = pdev->dev.of_node; -struct of_regulator_match *match;struct ab8500_platform_data *ppdata;struct ab8500_regulator_platform_data *pdata;int i, err; -struct ab8500_regulator_info *regulator_info; -int regulator_info_size; -struct ab8500_reg_init *reg_init; -int reg_init_size; -if (is_ab9540 (ab8500)) { - regulator_info = ab9540_regulator_info; - regulator_info_size =ARRAY_SIZE (ab9540_regulator_info); - reg_init = ab9540_reg_init; - reg_init_size =AB9540_NUM_REGULATOR_REGISTERS ; - match = ab9540_regulator_match; - match_size = ARRAY_SIZE(ab9540_regulator_match) - }else if (is_ab8505 (ab8500)) { - regulator_info = ab8505_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8505_regulator_info); - reg_init = ab8505_reg_init; - reg_init_size =AB8505_NUM_REGULATOR_REGISTERS ; - }else if (is_ab8540 (ab8500)) { - regulator_info = ab8540_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8540_regulator_info); - reg_init = ab8540_reg_init; - reg_init_size =AB8540_NUM_REGULATOR_REGISTERS ; - }else { - regulator_info = ab8500_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); - reg_init = ab8500_reg_init; - reg_init_size =AB8500_NUM_REGULATOR_REGISTERS ; - match = ab8500_regulator_match; - match_size = ARRAY_SIZE(ab8500_regulator_match) +if (!ab8500) { +dev_err (&pdev->dev,"null mfd parent\n" ); +return -EINVAL ; } +abx500_get_regulator_info (ab8500); +if (np) { - err =of_regulator_match (&pdev->dev, np, match, match_size); + err =of_regulator_match (&pdev->dev, np, + abx500_regulator.match, + abx500_regulator.match_size);if (err <0 ) {dev_err (&pdev->dev,"Error parsing regulator init data: %d\n" , err);return err; } - err =ab8500_regulator_of_probe (pdev, regulator_info, - regulator_info_size, match, np); + err =ab8500_regulator_of_probe (pdev, np);return err; } -if (!ab8500) { -dev_err (&pdev->dev,"null mfd parent\n" ); -return -EINVAL ; - } - ppdata =dev_get_platdata (ab8500->dev);if (!ppdata) {dev_err (&pdev->dev,"null parent pdata\n" );
@@ -3071,7 +3081,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) }/* make sure the platform data has the correct size */ -if (pdata->num_regulator != regulator_info_size) { +if (pdata->num_regulator != abx500_regulator.info_size) {dev_err (&pdev->dev,"Configuration error: size mismatch.\n" );return -EINVAL ; }
@@ -3090,9 +3100,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev) value = pdata->reg_init[i].value;/* check for configuration errors */ -BUG_ON (id >=AB8500_NUM_REGULATOR_REGISTERS ); +BUG_ON (id >= abx500_regulator.init_size); - err =ab8500_regulator_init_registers (pdev, reg_init, id, mask, value); + err =ab8500_regulator_init_registers (pdev, id, mask, value);if (err <0 )return err; }
@@ -3105,9 +3115,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev) }/* register all regulators */ -for (i =0 ; i < regulator_info_size; i++) { +for (i =0 ; i < abx500_regulator.info_size; i++) { err =ab8500_regulator_register (pdev, &pdata->regulator[i], - regulator_info, i,NULL ); + i,NULL );if (err <0 )return err; }
@@ -3119,27 +3129,10 @@ static int ab8500_regulator_remove(struct platform_device *pdev) {int i, err;struct ab8500 *ab8500 =dev_get_drvdata (pdev->dev.parent); -struct ab8500_regulator_info *regulator_info; -int regulator_info_size; - - -if (is_ab9540 (ab8500)) { - regulator_info = ab9540_regulator_info; - regulator_info_size =ARRAY_SIZE (ab9540_regulator_info); - }else if (is_ab8505 (ab8500)) { - regulator_info = ab8505_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8505_regulator_info); - }else if (is_ab8540 (ab8500)) { - regulator_info = ab8540_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8540_regulator_info); - }else { - regulator_info = ab8500_regulator_info; - regulator_info_size =ARRAY_SIZE (ab8500_regulator_info); - } -for (i =0 ; i < regulator_info_size; i++) { +for (i =0 ; i < abx500_regulator.info_size; i++) {struct ab8500_regulator_info *info =NULL ; - info = ®ulator_info[i]; + info = &abx500_regulator.info[i];dev_vdbg (rdev_get_dev (info->regulator),"%s-remove\n" , info->desc.name);
Signature · 1 line
1.7.9.5
PATCH 45/49 regulator: ab8500: Introduce aux5, aux6 regulators for AB8540
In reply to Lee JonesFrom: Zhenhua HUANG <[email protected]>
Introduce aux5, aux6 into ab8540 regulator framework.
--- drivers/regulator/ab8500.c | 65 ++++++++++++++++++++++++++++++++++++++ include/linux/regulator/ab8500.h | 2 ++ 2 files changed, 67 insertions(+)
drivers/regulator/ab8500.c +65 -0
@@ -151,6 +151,21 @@ static const unsigned int ldo_vaux3_ab8540_voltages[] = { 3050000, }; +static const int ldo_vaux56_ab8540_voltages[] = { +750000 ,760000 ,770000 ,780000 ,790000 ,800000 , +810000 ,820000 ,830000 ,840000 ,850000 ,860000 , +870000 ,880000 ,890000 ,900000 ,910000 ,920000 , +930000 ,940000 ,950000 ,960000 ,970000 ,980000 , +990000 ,1000000 ,1010000 ,1020000 ,1030000 , +1040000 ,1050000 ,1060000 ,1070000 ,1080000 , +1090000 ,1100000 ,1110000 ,1120000 ,1130000 , +1140000 ,1150000 ,1160000 ,1170000 ,1180000 , +1190000 ,1200000 ,1210000 ,1220000 ,1230000 , +1240000 ,1250000 ,1260000 ,1270000 ,1280000 , +1290000 ,1300000 ,1310000 ,1320000 ,1330000 , +1340000 ,1350000 ,1360000 ,1800000 ,2790000 , +}; +static const unsigned int ldo_vintcore_voltages[] = {1200000 ,1225000 ,
@@ -1560,6 +1575,54 @@ static struct ab8500_regulator_info .voltage_reg = 0x2f, .voltage_mask = 0x0f, }, + [AB8540_LDO_AUX5] = { + .desc = { + .name = "LDO-AUX5", + .ops = &ab8500_regulator_volt_mode_ops, + .type = REGULATOR_VOLTAGE, + .id = AB8540_LDO_AUX5, + .owner = THIS_MODULE, + .n_voltages = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), + }, + .load_lp_uA = 20000, +/* values for Vaux5Regu register */ + .update_bank = 0x04, + .update_reg = 0x32, + .update_mask = 0x03, + .update_val = 0x01, + .update_val_idle = 0x03, + .update_val_normal = 0x01, +/* values for Vaux5SEL register */ + .voltage_bank = 0x04, + .voltage_reg = 0x33, + .voltage_mask = 0x3f, + .voltages = ldo_vaux56_ab8540_voltages, + .voltages_len = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), + }, + [AB8540_LDO_AUX6] = { + .desc = { + .name = "LDO-AUX6", + .ops = &ab8500_regulator_volt_mode_ops, + .type = REGULATOR_VOLTAGE, + .id = AB8540_LDO_AUX6, + .owner = THIS_MODULE, + .n_voltages = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), + }, + .load_lp_uA = 20000, +/* values for Vaux6Regu register */ + .update_bank = 0x04, + .update_reg = 0x35, + .update_mask = 0x03, + .update_val = 0x01, + .update_val_idle = 0x03, + .update_val_normal = 0x01, +/* values for Vaux6SEL register */ + .voltage_bank = 0x04, + .voltage_reg = 0x36, + .voltage_mask = 0x3f, + .voltages = ldo_vaux56_ab8540_voltages, + .voltages_len = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), + }, [AB8540_LDO_INTCORE] = { .desc = { .name = "LDO-INTCORE",
@@ -2965,6 +3028,8 @@ static struct of_regulator_match ab8540_regulator_match[] = { { .name = "ab8500_ldo_aux2", .driver_data = (void *) AB8540_LDO_AUX2, }, { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8540_LDO_AUX3, }, { .name = "ab8500_ldo_aux4", .driver_data = (void *) AB8540_LDO_AUX4, }, + { .name = "ab8500_ldo_aux5", .driver_data = (void *) AB8540_LDO_AUX5, }, + { .name = "ab8500_ldo_aux6", .driver_data = (void *) AB8540_LDO_AUX6, }, { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8540_LDO_INTCORE, }, { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, },
include/linux/regulator/ab8500.h +2 -0
@@ -74,6 +74,8 @@ enum ab8540_regulator_id {AB8540_LDO_AUX2 ,AB8540_LDO_AUX3 ,AB8540_LDO_AUX4 , +AB8540_LDO_AUX5 , +AB8540_LDO_AUX6 ,AB8540_LDO_INTCORE ,AB8540_LDO_TVOUT , AB8540_LDO_AUDIO,
Signature · 1 line
1.7.9.5
PATCH 46/49 regulator: ab8500: Set enable enable_time in regulator_desc
In reply to Lee JonesAllow the regulator framework to directly access the time it takes any given regulator to settle. This saves time and code because without it we would have to implement a dedication function to read the value from elsewhere.
--- drivers/regulator/ab8500.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/regulator/ab8500.c +3 -0
@@ -1097,6 +1097,7 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage, + .enable_time = 10000, }, .delay = 10000, .load_lp_uA = 1000,
@@ -1361,6 +1362,7 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage, + .enable_time = 10000, }, .delay = 10000, .load_lp_uA = 1000,
@@ -1658,6 +1660,7 @@ static struct ab8500_regulator_info .id = AB8540_LDO_TVOUT, .owner = THIS_MODULE, .n_voltages = 1, + .enable_time = 10000, }, .delay = 10000, .load_lp_uA = 1000,
Signature · 1 line
1.7.9.5
PATCH 47/49 regulator: ab8500: Remove the need for a 'delay' property
In reply to Lee JonesThe regulator framework now has provisions to read a regulator's start-up time via the 'enable_time' attribute. So let's remove all 'enable_time'/'delay' duplication and just stick with 'enable_time' from now on.
--- drivers/regulator/ab8500.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/regulator/ab8500.c +1 -7
@@ -63,7 +63,6 @@ struct ab8500_shared_mode {* @voltage_reg: register to control regulator voltage * @voltage_mask: mask to control regulator voltage * @voltage_shift: shift to control regulator voltage -* @delay: startup/set voltage delay in us */ struct ab8500_regulator_info {struct device *dev;
@@ -87,7 +86,6 @@ struct ab8500_regulator_info {u8 voltage_reg;u8 voltage_mask;u8 voltage_shift; -unsigned int delay;struct {u8 voltage_limit;u8 voltage_bank;
@@ -652,7 +650,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev, {struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); -return info->delay; +return info->desc.enable_time; }static struct regulator_ops ab8500_regulator_volt_mode_ops = {
@@ -829,7 +827,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 500, }, - .delay = 500, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1099,7 +1096,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1364,7 +1360,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1662,7 +1657,6 @@ static struct ab8500_regulator_info .n_voltages = 1, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
Signature · 1 line
1.7.9.5
PATCH 48/49 regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages
In reply to Lee JonesThe regulator framework offers a generic regulator_list_voltage_table() function which can directly look-up a regulator's voltage capabilities using a table provided through the desc structure. This patch ensures that information is available.
--- drivers/regulator/ab8500.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/regulator/ab8500.c +6 -13
@@ -926,7 +926,7 @@ static struct ab8500_regulator_info* Variable Voltage Regulators * name, min mV, max mV, * update bank, reg, mask, enable val -* volt bank, reg, mask, table, table length +* volt bank, reg, mask */ [AB8505_LDO_AUX1] = { .desc = {
@@ -1139,8 +1139,6 @@ static struct ab8500_regulator_info .voltage_reg = 0x57, .voltage_mask = 0x7, .voltage_shift = 4, - .voltages = ldo_vaudio_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaudio_voltages), }, [AB8505_LDO_ANAMIC1] = { .desc = {
@@ -1222,8 +1220,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x29, .voltage_mask = 0x7, - .voltages = ldo_vana_voltages, - .voltages_len = ARRAY_SIZE(ldo_vana_voltages), }, };
@@ -1234,7 +1230,7 @@ static struct ab8500_regulator_info* Variable Voltage Regulators * name, min mV, max mV, * update bank, reg, mask, enable val -* volt bank, reg, mask, table, table length +* volt bank, reg, mask */ [AB9540_LDO_AUX1] = { .desc = {
@@ -1477,7 +1473,7 @@ static struct ab8500_regulator_info* Variable Voltage Regulators * name, min mV, max mV, * update bank, reg, mask, enable val -* volt bank, reg, mask, table, table length +* volt bank, reg, mask */ [AB8540_LDO_AUX1] = { .desc = {
@@ -1580,6 +1576,7 @@ static struct ab8500_regulator_info .id = AB8540_LDO_AUX5, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), + .volt_table = ldo_vaux56_ab8540_voltages, }, .load_lp_uA = 20000,/* values for Vaux5Regu register */
@@ -1593,8 +1590,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x33, .voltage_mask = 0x3f, - .voltages = ldo_vaux56_ab8540_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), }, [AB8540_LDO_AUX6] = { .desc = {
@@ -1604,6 +1599,7 @@ static struct ab8500_regulator_info .id = AB8540_LDO_AUX6, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), + .volt_table = ldo_vaux56_ab8540_voltages, }, .load_lp_uA = 20000,/* values for Vaux6Regu register */
@@ -1617,8 +1613,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x36, .voltage_mask = 0x3f, - .voltages = ldo_vaux56_ab8540_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaux56_ab8540_voltages), }, [AB8540_LDO_INTCORE] = { .desc = {
@@ -1727,6 +1721,7 @@ static struct ab8500_regulator_info .id = AB8540_LDO_DMIC, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vdmic_voltages), + .volt_table = ldo_vdmic_voltages, }, .load_lp_uA = 1000, .update_bank = 0x03,
@@ -1736,8 +1731,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x03, .voltage_reg = 0x83, .voltage_mask = 0xc0, - .voltages = ldo_vdmic_voltages, - .voltages_len = ARRAY_SIZE(ldo_vdmic_voltages), },/*
Signature · 1 line
1.7.9.5
PATCH 49/49 ARM: ux500: Pass regulator platform data using the new format
In reply to Lee JonesRegulator platform data is now passed though a single structure as opposed to the old way where four separate struct elements were required. This patch makes use of the new format.
--- arch/arm/mach-ux500/board-mop500.c | 5 +---- include/linux/mfd/abx500/ab8500.h | 11 ++--------- 2 files changed, 3 insertions(+), 13 deletions(-)
arch/arm/mach-ux500/board-mop500.c +1 -4
@@ -217,10 +217,7 @@ static struct platform_device snowball_sbnet_dev = {static struct ab8500_platform_data ab8500_platdata = { .irq_base =MOP500_AB8500_IRQ_BASE , - .regulator_reg_init = ab8500_regulator_reg_init, - .num_regulator_reg_init =ARRAY_SIZE (ab8500_regulator_reg_init), - .regulator = ab8500_regulators, - .num_regulator =ARRAY_SIZE (ab8500_regulators), + .regulator = &ab8500_regulator_plat_data, .gpio = &ab8500_gpio_pdata, .codec = &ab8500_codec_pdata, };
include/linux/mfd/abx500/ab8500.h +2 -9
@@ -266,8 +266,7 @@ struct ab8500 {const int *irq_reg_offset; }; -struct regulator_reg_init ; -struct regulator_init_data ; +struct ab8500_regulator_platform_data ;struct ab8500_gpio_platform_data ;struct ab8500_codec_platform_data ;
@@ -275,18 +274,12 @@ struct ab8500_codec_platform_data;* struct ab8500_platform_data - AB8500 platform data * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used * @init: board-specific initialization after detection of ab8500 -* @num_regulator_reg_init: number of regulator init registers -* @regulator_reg_init: regulator init registers -* @num_regulator: number of regulators * @regulator: machine-specific constraints for regulators */ struct ab8500_platform_data {int irq_base;void (*init) (struct ab8500 *); -int num_regulator_reg_init; -struct ab8500_regulator_reg_init *regulator_reg_init; -int num_regulator; -struct regulator_init_data *regulator; +struct ab8500_regulator_platform_data *regulator;struct ab8500_gpio_platform_data *gpio;struct ab8500_codec_platform_data *codec; };
Signature · 1 line
1.7.9.5