From 3344b88c34805b1cf93672ea99a75287341bf692 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Thu, 25 Aug 2011 15:01:00 +0530 Subject: ux500: regulators: update Regulator updates from: commit 7ff261a375cf1da4b9a701b7106d42f11df50b3d Author: Avinash A Date: Fri Aug 12 16:01:23 2011 +0530 mach-ux500:ts-cypress add support on u8500 platform related changes to add support for the cypress touchscreen on u8500 ST-Ericsson ID: CR321190 commit c7f9ac5e687f8df6f2b48f48370d2cd4479237fa Author: Bengt Jonsson Date: Wed Jul 13 14:19:41 2011 +0200 regulators: ab8500: Removed initialization of body biasing Body biasing is handled by PRCMU and should not be overwritten by the kernel. ST-Ericsson ID: 350693 commit 2b74dbcb79a288e709b18dbda9cf592209ad1cdf Author: Mian Yousaf Kaukab Date: Fri Jul 1 18:18:18 2011 +0200 regulator: change vsmps3 from 1.0V to 0.925V ST-Ericsson ID: 350469 commit fcfcc8a7e23970134aeb557d23726e3213e5c79d Author: Bengt Jonsson Date: Tue May 31 15:43:29 2011 +0200 regulators: ab8500: Added more configurable bits ST Ericsson ID: 334602 commit 4faa6311bef9c32ebc39d7318ec8d1ced45dce31 Author: Bengt Jonsson Date: Tue May 31 15:54:25 2011 +0200 ARM: ux500: regulators: add mask for configuration 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. ST Ericsson ID: 334602 commit a8d27ada3b9bed3f57691fa6a32c831dd48a8e3b Author: Mian Yousaf Kaukab Date: Thu Jun 30 14:22:57 2011 +0200 regulator: update suspend force value for ExtSupplyRegu For HREFP_2.2 Vext1 needs to be on otherwise AB8500 looses its register contents during suspend. Vext2 is not connected to any regulator. Vext3 must be turned off. Rework is need on HREFP_2.2 in order to turn off VSMPS4_EXT_3V4 ST-Ericsson ID: 349114 commit a5dcb7001a7a42812f92461401675168943e2806 Author: Mian Yousaf Kaukab Date: Tue Jun 28 16:45:26 2011 +0200 regulators: update VextSupplies fix VextSupplies fix is not need on boards with DB8500v2.1. Add check to remove forcing of the VextSupply only for DB8500v2.2. ST-Ericsson ID: 349724 Change-Id: Ied04ee6546d3ddcda28635d221ec1b9b5306439c --- include/linux/regulator/ab8500.h | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 29b5e19c4f4..09ddc33ae61 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -17,7 +17,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, @@ -31,17 +30,20 @@ enum ab8500_regulator_id { /* AB8500 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 */ enum ab8500_regulator_reg { + AB8500_REGUREQUESTCTRL1, AB8500_REGUREQUESTCTRL2, AB8500_REGUREQUESTCTRL3, AB8500_REGUREQUESTCTRL4, @@ -58,26 +60,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, }; -- cgit v1.2.3