From 619866e86ed98ad5b10c159e38f553cb7b1227a5 Mon Sep 17 00:00:00 2001 From: Martin Persson Date: Mon, 4 Feb 2013 11:53:18 +0000 Subject: [PATCH] regulator: ab8500: Add init values for vsmps1/2 Signed-off-by: Martin Persson Signed-off-by: Lee Jones Reviewed-by: Emeric VIGIER Reviewed-by: Bengt JONSSON Signed-off-by: Mark Brown --- arch/arm/mach-ux500/board-mop500-regulators.c | 14 +++++++++++++- drivers/regulator/ab8500.c | 14 +++++++++++++- include/linux/regulator/ab8500.h | 2 ++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index ba379f78c58a..42eef8033d7f 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -146,8 +146,10 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled + * Vsmps2SysClkReq1HPValid = enabled + * Vsmps1SysClkReq1HPValid = enabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03), /* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled @@ -251,6 +253,16 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { * NOTE! PRCMU register */ INIT_REGULATOR_REGISTER(AB8500_VBBSEL2, 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), /* * VPll = Hw controlled * VanaRegu = force off diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index b36941171ea3..84cd11c7b28f 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -494,12 +494,14 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_REGUREQUESTCTRL4, 0x03, 0x06, 0x07), /* + * 0x01, Vsmps1SysClkReq1HPValid + * 0x02, Vsmps2SysClkReq1HPValid * 0x08, VanaSysClkReq1HPValid * 0x20, Vaux1SysClkReq1HPValid * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xe8), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xeb), /* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid @@ -595,6 +597,16 @@ static struct ab8500_reg_init ab8500_reg_init[] = { * NOTE! PRCMU register */ REG_INIT(AB8500_VBBSEL2, 0x04, 0x12, 0x0f), + /* + * 0x0c, Vsmps1SelCtrl + * 0x03, Vsmps1Regu + */ + REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x0f), + /* + * 0x0c, Vsmps2SelCtrl + * 0x03, Vsmps2Regu + */ + REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x0f), /* * 0x0c, VanaRegu * 0x03, VpllRegu diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index d61adb93bf0a..e54c8aff25ba 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -89,6 +89,8 @@ enum ab8500_regulator_reg { AB8500_ARMREGU2, /* NOTE! PRCMU register */ AB8500_VBBSEL1, /* NOTE! PRCMU register */ AB8500_VBBSEL2, /* NOTE! PRCMU register */ + AB8500_VSMPS1REGU, + AB8500_VSMPS2REGU, AB8500_VSMPS1SEL1, AB8500_NUM_REGULATOR_REGISTERS, }; -- 2.39.5