From: Lee Jones <lee.jones@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 06/49] regulator: ab8500: Another push to synchronise recent AB8500 developments
Date: Wed, 6 Feb 2013 10:53:28 +0000 [thread overview]
Message-ID: <1360148051-7560-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org>
This 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.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
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(-)
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 96dd174..a8141e3 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -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
*/
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index b1b9687..abc9e43 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -614,11 +614,19 @@ struct ab8500_reg_init {
static struct ab8500_reg_init ab8500_reg_init[] = {
/*
- * 0x30, VanaRequestCtrl
+ * 0x03, VarmRequestCtrl
+ * 0x0c, VapeRequestCtrl
+ * 0x30, Vsmps1RequestCtrl
+ * 0xc0, Vsmps2RequestCtrl
+ */
+ REG_INIT(AB8500_REGUREQUESTCTRL1, 0x03, 0x03, 0xff),
+ /*
+ * 0x03, Vsmps3RequestCtrl
* 0x0c, VpllRequestCtrl
+ * 0x30, VanaRequestCtrl
* 0xc0, VextSupply1RequestCtrl
*/
- REG_INIT(AB8500_REGUREQUESTCTRL2, 0x03, 0x04, 0xfc),
+ REG_INIT(AB8500_REGUREQUESTCTRL2, 0x03, 0x04, 0xff),
/*
* 0x03, VextSupply2RequestCtrl
* 0x0c, VextSupply3RequestCtrl
@@ -643,50 +651,71 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
*/
REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xff),
/*
+ * 0x01, VapeSysClkReq1HPValid
+ * 0x02, VarmSysClkReq1HPValid
+ * 0x04, VbbSysClkReq1HPValid
+ * 0x08, VmodSysClkReq1HPValid
* 0x10, VextSupply1SysClkReq1HPValid
* 0x20, VextSupply2SysClkReq1HPValid
* 0x40, VextSupply3SysClkReq1HPValid
*/
- REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID2, 0x03, 0x08, 0x70),
+ REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID2, 0x03, 0x08, 0x7f),
/*
+ * 0x01, Vsmps1HwHPReq1Valid
+ * 0x02, Vsmps2HwHPReq1Valid
+ * 0x04, Vsmps3HwHPReq1Valid
* 0x08, VanaHwHPReq1Valid
+ * 0x10, VpllHwHPReq1Valid
* 0x20, Vaux1HwHPReq1Valid
* 0x40, Vaux2HwHPReq1Valid
* 0x80, Vaux3HwHPReq1Valid
*/
- REG_INIT(AB8500_REGUHWHPREQ1VALID1, 0x03, 0x09, 0xe8),
+ REG_INIT(AB8500_REGUHWHPREQ1VALID1, 0x03, 0x09, 0xff),
/*
* 0x01, VextSupply1HwHPReq1Valid
* 0x02, VextSupply2HwHPReq1Valid
* 0x04, VextSupply3HwHPReq1Valid
+ * 0x08, VmodHwHPReq1Valid
*/
- REG_INIT(AB8500_REGUHWHPREQ1VALID2, 0x03, 0x0a, 0x07),
+ REG_INIT(AB8500_REGUHWHPREQ1VALID2, 0x03, 0x0a, 0x0f),
/*
+ * 0x01, Vsmps1HwHPReq2Valid
+ * 0x02, Vsmps2HwHPReq2Valid
+ * 0x03, Vsmps3HwHPReq2Valid
* 0x08, VanaHwHPReq2Valid
+ * 0x10, VpllHwHPReq2Valid
* 0x20, Vaux1HwHPReq2Valid
* 0x40, Vaux2HwHPReq2Valid
* 0x80, Vaux3HwHPReq2Valid
*/
- REG_INIT(AB8500_REGUHWHPREQ2VALID1, 0x03, 0x0b, 0xe8),
+ REG_INIT(AB8500_REGUHWHPREQ2VALID1, 0x03, 0x0b, 0xff),
/*
* 0x01, VextSupply1HwHPReq2Valid
* 0x02, VextSupply2HwHPReq2Valid
* 0x04, VextSupply3HwHPReq2Valid
+ * 0x08, VmodHwHPReq2Valid
*/
- REG_INIT(AB8500_REGUHWHPREQ2VALID2, 0x03, 0x0c, 0x07),
+ REG_INIT(AB8500_REGUHWHPREQ2VALID2, 0x03, 0x0c, 0x0f),
/*
+ * 0x01, VapeSwHPReqValid
+ * 0x02, VarmSwHPReqValid
+ * 0x04, Vsmps1SwHPReqValid
+ * 0x08, Vsmps2SwHPReqValid
+ * 0x10, Vsmps3SwHPReqValid
* 0x20, VanaSwHPReqValid
+ * 0x40, VpllSwHPReqValid
* 0x80, Vaux1SwHPReqValid
*/
- REG_INIT(AB8500_REGUSWHPREQVALID1, 0x03, 0x0d, 0xa0),
+ REG_INIT(AB8500_REGUSWHPREQVALID1, 0x03, 0x0d, 0xff),
/*
* 0x01, Vaux2SwHPReqValid
* 0x02, Vaux3SwHPReqValid
* 0x04, VextSupply1SwHPReqValid
* 0x08, VextSupply2SwHPReqValid
* 0x10, VextSupply3SwHPReqValid
+ * 0x20, VmodSwHPReqValid
*/
- REG_INIT(AB8500_REGUSWHPREQVALID2, 0x03, 0x0e, 0x1f),
+ REG_INIT(AB8500_REGUSWHPREQVALID2, 0x03, 0x0e, 0x3f),
/*
* 0x02, SysClkReq2Valid1
* ...
@@ -720,36 +749,22 @@ 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
+ * 0x10, Vsmps1AutoMode
+ * 0x20, Vsmps1PWMMode
*/
- REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x0f),
+ REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x3f),
/*
* 0x03, Vsmps2Regu
* 0x0c, Vsmps2SelCtrl
+ * 0x10, Vsmps2AutoMode
+ * 0x20, Vsmps2PWMMode
*/
- REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x0f),
+ REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x3f),
/*
- * 0x0c, VanaRegu
* 0x03, VpllRegu
+ * 0x0c, VanaRegu
*/
REG_INIT(AB8500_VPLLVANAREGU, 0x04, 0x06, 0x0f),
/*
@@ -789,13 +804,16 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
REG_INIT(AB8500_VAUX2SEL, 0x04, 0x20, 0x0f),
/*
* 0x07, Vaux3Sel
+ * 0x30, Vrf1Sel
*/
- REG_INIT(AB8500_VRF1VAUX3SEL, 0x04, 0x21, 0x07),
+ REG_INIT(AB8500_VRF1VAUX3SEL, 0x04, 0x21, 0x37),
/*
* 0x01, VextSupply12LP
*/
REG_INIT(AB8500_REGUCTRL2SPARE, 0x04, 0x22, 0x01),
/*
+ * 0x01, VpllDisch
+ * 0x02, Vrf1Disch
* 0x04, Vaux1Disch
* 0x08, Vaux2Disch
* 0x10, Vaux3Disch
@@ -803,13 +821,15 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
* 0x40, VTVoutDisch
* 0x80, VaudioDisch
*/
- REG_INIT(AB8500_REGUCTRLDISCH, 0x04, 0x43, 0xfc),
+ REG_INIT(AB8500_REGUCTRLDISCH, 0x04, 0x43, 0xff),
/*
+ * 0x01, VsimDisch
* 0x02, VanaDisch
* 0x04, VdmicPullDownEna
+ * 0x08, VpllPullDownEna
* 0x10, VdmicDisch
*/
- REG_INIT(AB8500_REGUCTRLDISCH2, 0x04, 0x44, 0x16),
+ REG_INIT(AB8500_REGUCTRLDISCH2, 0x04, 0x44, 0x1f),
};
static int ab8500_regulator_init_registers(struct platform_device *pdev,
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index a1d245f..dd7944f 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -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,
};
--
1.7.9.5
next prev parent reply other threads:[~2013-02-06 11:06 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 10:53 [PATCH 00/49] Regulators: Bring the AB8500 into the 21st century Lee Jones
2013-02-06 10:53 ` [PATCH 01/49] regulator: ab8500: Further populate initialisation registers Lee Jones
2013-02-07 18:45 ` Mark Brown
2013-02-08 8:20 ` Lee Jones
2013-02-08 10:55 ` Mark Brown
2013-02-06 10:53 ` [PATCH 02/49] regulator: ab8500: Add set_mode/get_mode support Lee Jones
2013-02-06 10:53 ` [PATCH 03/49] regulator: ab8500: Fix for regulator_set_mode functionality Lee Jones
2013-02-07 18:47 ` Mark Brown
2013-02-06 10:53 ` [PATCH 04/49] regulator: ab8500: Added get_optimum_mode on regulators with idle mode Lee Jones
2013-02-07 18:49 ` Mark Brown
2013-02-06 10:53 ` [PATCH 05/49] ARM: ux500: regulators: Add mask for configuration Lee Jones
2013-02-07 18:51 ` Mark Brown
2013-02-07 19:08 ` Linus Walleij
2013-02-06 10:53 ` Lee Jones [this message]
2013-02-06 10:53 ` [PATCH 07/49] regulator: ab8500: Separate regulator and MFD platform data Lee Jones
2013-02-06 10:53 ` [PATCH 08/49] regulator: ab8500: Add support of low voltage battery Lee Jones
2013-02-06 10:53 ` [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list Lee Jones
2013-02-07 15:34 ` Linus Walleij
2013-02-07 15:55 ` Mark Brown
2013-02-07 17:50 ` Lee Jones
2013-02-07 19:06 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 10/49] regulator: ab8500-ext: Cosmetic changes Lee Jones
2013-02-06 10:53 ` [PATCH 11/49] regulator: ab8500-ext: Add HW request support Lee Jones
2013-02-06 10:53 ` [PATCH 12/49] regulator: ab8500-ext: Add suspend support Lee Jones
2013-02-06 10:53 ` [PATCH 13/49] regulator: ab8500: Remove USB regulator Lee Jones
2013-02-06 10:53 ` [PATCH 14/49] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-02-06 10:53 ` [PATCH 15/49] ARM: ux500: Add supply for the L3G4200D Gyroscope Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-08 4:25 ` Srinidhi Kasagar
2013-02-06 10:53 ` [PATCH 16/49] ARM: ux500: Add supply for the Proximity and Hal sensor Lee Jones
2013-02-07 15:34 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 17/49] ARM: ux500: Add supply for the Ambient light sensor device Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 18/49] ARM: ux500: Add supply for the Pressure sensor Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 19/49] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 20/49] ARM: ux500: regulators: List the MMIO camera as a consumer of VAUX1 Lee Jones
2013-02-07 15:42 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 21/49] regulator: ab8500: Clean out SoC registers Lee Jones
2013-02-06 10:53 ` [PATCH 22/49] regulator: ab8500: Prepare the driver for additional platforms Lee Jones
2013-02-06 10:53 ` [PATCH 23/49] regulator: ab8500: Add support for the ab9540 Lee Jones
2013-02-06 10:53 ` [PATCH 24/49] regulator: ab8500: Correct TVOUT regulator start-up delay Lee Jones
2013-02-06 10:53 ` [PATCH 25/49] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-02-06 10:53 ` [PATCH 26/49] ARM: ux500: Partially revert changes surrounding audio regulators Lee Jones
2013-02-07 15:38 ` Linus Walleij
2013-02-07 17:54 ` Lee Jones
2013-02-08 12:10 ` Lee Jones
2013-02-06 10:53 ` [PATCH 27/49] regulator: ab8500: add support for ab8505 Lee Jones
2013-02-06 10:53 ` [PATCH 28/49] ARM: ux500: regulator: Use device IDs instead of device names Lee Jones
2013-02-07 15:43 ` Linus Walleij
2013-02-08 11:13 ` Mark Brown
2013-02-06 10:53 ` [PATCH 29/49] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-02-06 10:53 ` [PATCH 30/49] regulator: ab8500: Add support for the ab8540 Lee Jones
2013-02-06 10:53 ` [PATCH 31/49] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-02-06 10:53 ` [PATCH 32/49] regulator: ab8500: Delete useless fixed_uV field Lee Jones
2013-02-06 10:53 ` [PATCH 33/49] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-02-06 10:53 ` [PATCH 34/49] regulator: ab8500: Fix vsdio parameters for AB8540 based platforms Lee Jones
2013-02-06 10:53 ` [PATCH 35/49] regulator: ab8500: Correct regulator id values Lee Jones
2013-02-06 10:53 ` [PATCH 36/49] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-02-06 10:53 ` [PATCH 37/49] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-02-06 10:54 ` [PATCH 38/49] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-02-06 10:54 ` [PATCH 39/49] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-02-06 10:54 ` [PATCH 40/49] regulator: ab8500: Default value on LDO USB to HP Lee Jones
2013-02-06 10:54 ` [PATCH 41/49] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-02-06 10:54 ` [PATCH 42/49] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-02-06 10:54 ` [PATCH 43/49] regulator: ab8500-ext: Adapt regulator registration for newly changed API Lee Jones
2013-02-06 10:54 ` [PATCH 44/49] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-02-06 10:54 ` [PATCH 45/49] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-02-06 10:54 ` [PATCH 46/49] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-02-06 10:54 ` [PATCH 47/49] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-02-06 10:54 ` [PATCH 48/49] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-02-06 10:54 ` [PATCH 49/49] ARM: ux500: Pass regulator platform data using the new format Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360148051-7560-7-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).