From 203de9949259a8ec5ca2d1f7c9fb92dc3c77d8e4 Mon Sep 17 00:00:00 2001 From: Martin Persson Date: Sat, 5 Mar 2011 16:03:26 +0100 Subject: Revert "ARM: ux500: Update regulator settings" With this patch it always reboots or freeze when Lauterbach is connected, until that is solved this patch will be reverted. This reverts commit b58bbc0ca8a76f079fcb9abc68b76dc55797d4d1. Conflicts: arch/arm/mach-ux500/board-mop500-regulators.c drivers/regulator/ab8500.c Change-Id: Icb4d095ddb6a1fa479265015695140fd82e13a64 Signed-off-by: Martin Persson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17697 Reviewed-by: Rickard ANDERSSON --- arch/arm/mach-ux500/board-mop500-regulators.c | 46 +++++++-------------------- drivers/regulator/ab8500.c | 22 +------------ include/linux/regulator/ab8500.h | 4 --- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index bccb1493561..031fdfe2cc7 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -30,12 +30,12 @@ struct ab8500_regulator_reg_init */ INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0x00), /* - * VextSupply2RequestCtrl = HP/OFF depending on VxRequest - * VextSupply3RequestCtrl = HP/OFF depending on VxRequest - * Vaux1RequestCtrl = HP/OFF depending on VxRequest + * 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, 0x15), + INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL3, 0x00), /* * Vaux3RequestCtrl = HP/LP depending on VxRequest * SwHPReq = Control through SWValid disabled @@ -43,21 +43,17 @@ struct ab8500_regulator_reg_init INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00), /* * VanaSysClkReq1HPValid = disabled - * VpllSysClkReq1HPValid = enabled - * Vaux1SysClkReq1HPValid = enabled + * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled - * Vsmps3SysClkReq1HPValid = enabled - * Vsmps2SysClkReq1HPValid = enabled - * Vsmps1SysClkReq1HPValid = enabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x37), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x0), /* * VextSupply1SysClkReq1HPValid = disabled - * VextSupply2SysClkReq1HPValid = SysClkReq1 controlled + * VextSupply2SysClkReq1HPValid = disabled * VextSupply3SysClkReq1HPValid = SysClkReq1 controlled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x60), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x40), /* * VanaHwHPReq1Valid = disabled * Vaux1HwHPreq1Valid = disabled @@ -137,26 +133,6 @@ struct ab8500_regulator_reg_init * Vamic2_dzout = high-Z when Vamic2 is disabled */ INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x00), - /* - * VBBN = force OFF - * VBBP = force OFF - */ - INIT_REGULATOR_REGISTER(AB8500_ARMREGU2, 0x00), - /* - * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 - * Vsmps1Regu = HW control - */ - INIT_REGULATOR_REGISTER(AB8500_VSMPS1REGU, 0x06), - /* - * Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 - * Vsmps2Regu = HW control - */ - INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x06), - /* - * Vsmps3SelCtrl = Vsmps3 voltage defined by Vsmsp3Sel2 - * Vsmps3Regu = HW control - */ - INIT_REGULATOR_REGISTER(AB8500_VSMPS3REGU, 0x06), /* * VPll = Hw controlled * VanaRegu = force off @@ -174,12 +150,12 @@ struct ab8500_regulator_reg_init * ExtSupply2Bypass = ExtSupply12LPn ball is 0 when Ena is 0 * ExtSupply3Bypass = ExtSupply3LPn ball is 0 when Ena is 0 */ - INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0x28), + INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0x2a), /* - * Vaux1Regu = force HP/OFF + * Vaux1Regu = force HP * Vaux2Regu = force off */ - INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x02), + INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x01), /* * Vaux3regu = force off */ diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 55ff9cecc70..ea05d5518e3 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -566,7 +566,7 @@ static struct ab8500_reg_init ab8500_reg_init[] = { * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xff), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xe8), /* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid @@ -644,26 +644,6 @@ static struct ab8500_reg_init ab8500_reg_init[] = { * 0x02, Vamic2_dzout */ REG_INIT(AB8500_REGUCTRL1VAMIC, 0x03, 0x84, 0x03), - /* - * 0x0c, VBBNRegu - * 0x03, VBBPRegu - */ - REG_INIT(AB8500_ARMREGU2, 0x04, 0x01, 0x0f), - /* - * 0x0c, Vsmps1SelCtrl - * 0x03, Vsmps1Regu - */ - REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x0f), - /* - * 0x0c, Vsmps2SelCtrl - * 0x03, Vsmps2Regu - */ - REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x0f), - /* - * 0x0c, Vsmps3SelCtrl - * 0x03, Vsmps3Regu - */ - REG_INIT(AB8500_VSMPS3REGU, 0x04, 0x05, 0x0f), /* * 0x0c, VanaRegu * 0x03, VpllRegu diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 69449e8c229..76579f964a2 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -67,10 +67,6 @@ enum ab8500_regulator_reg { AB8500_REGUCTRL2SPARE, AB8500_REGUCTRLDISCH, AB8500_REGUCTRLDISCH2, - AB8500_ARMREGU2, - AB8500_VSMPS1REGU, - AB8500_VSMPS2REGU, - AB8500_VSMPS3REGU, AB8500_VSMPS1SEL1, AB8500_NUM_REGULATOR_REGISTERS, }; -- cgit v1.2.3