Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa3a824 authored by Bengt Jonsson's avatar Bengt Jonsson Committed by Linus Walleij
Browse files

mach-ux500: provide ab8500 init vector 



This adds an ab8500 regulator initialization vector for the
HREF/MOP500 series of boards. This also sets the display
regulator to be on at boot so we don't loose our splash
screen when the board comes up.

Signed-off-by: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3ef374a2

arch/arm/mach-ux500/board-mop500-regulators.c

+177 −0
Original line number Diff line number Diff line
@@ -62,6 +62,182 @@ static struct regulator_consumer_supply ab8500_vana_consumers[] = { 
	REGULATOR_SUPPLY("vsmps2", "mcde.0"),

};



/* ab8500 regulator register initialization */

struct ab8500_regulator_reg_init

ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {

	/*

	 * VanaRequestCtrl          = HP/LP depending on VxRequest

	 * VextSupply1RequestCtrl   = HP/LP depending on VxRequest

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 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),

	/*

	 * Vaux3RequestCtrl         = HP/LP depending on VxRequest

	 * SwHPReq                  = Control through SWValid disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00),

	/*

	 * VanaSysClkReq1HPValid    = disabled

	 * Vaux1SysClkReq1HPValid   = disabled

	 * Vaux2SysClkReq1HPValid   = disabled

	 * Vaux3SysClkReq1HPValid   = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00),

	/*

	 * VextSupply1SysClkReq1HPValid = disabled

	 * VextSupply2SysClkReq1HPValid = disabled

	 * VextSupply3SysClkReq1HPValid = SysClkReq1 controlled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x40),

	/*

	 * VanaHwHPReq1Valid        = disabled

	 * Vaux1HwHPreq1Valid       = disabled

	 * Vaux2HwHPReq1Valid       = disabled

	 * Vaux3HwHPReqValid        = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID1, 0x00),

	/*

	 * VextSupply1HwHPReq1Valid = disabled

	 * VextSupply2HwHPReq1Valid = disabled

	 * VextSupply3HwHPReq1Valid = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID2, 0x00),

	/*

	 * VanaHwHPReq2Valid        = disabled

	 * Vaux1HwHPReq2Valid       = disabled

	 * Vaux2HwHPReq2Valid       = disabled

	 * Vaux3HwHPReq2Valid       = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID1, 0x00),

	/*

	 * VextSupply1HwHPReq2Valid = disabled

	 * VextSupply2HwHPReq2Valid = disabled

	 * VextSupply3HwHPReq2Valid = HWReq2 controlled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID2, 0x04),

	/*

	 * VanaSwHPReqValid         = disabled

	 * Vaux1SwHPReqValid        = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID1, 0x00),

	/*

	 * Vaux2SwHPReqValid        = disabled

	 * Vaux3SwHPReqValid        = disabled

	 * VextSupply1SwHPReqValid  = disabled

	 * VextSupply2SwHPReqValid  = disabled

	 * VextSupply3SwHPReqValid  = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2, 0x00),

	/*

	 * SysClkReq2Valid1         = SysClkReq2 controlled

	 * SysClkReq3Valid1         = disabled

	 * SysClkReq4Valid1         = SysClkReq4 controlled

	 * SysClkReq5Valid1         = disabled

	 * SysClkReq6Valid1         = SysClkReq6 controlled

	 * SysClkReq7Valid1         = disabled

	 * SysClkReq8Valid1         = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1, 0x2a),

	/*

	 * SysClkReq2Valid2         = disabled

	 * SysClkReq3Valid2         = disabled

	 * SysClkReq4Valid2         = disabled

	 * SysClkReq5Valid2         = disabled

	 * SysClkReq6Valid2         = SysClkReq6 controlled

	 * SysClkReq7Valid2         = disabled

	 * SysClkReq8Valid2         = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2, 0x20),

	/*

	 * VTVoutEna                = disabled

	 * Vintcore12Ena            = disabled

	 * Vintcore12Sel            = 1.25 V

	 * Vintcore12LP             = inactive (HP)

	 * VTVoutLP                 = inactive (HP)

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUMISC1, 0x10),

	/*

	 * VaudioEna                = disabled

	 * VdmicEna                 = disabled

	 * Vamic1Ena                = disabled

	 * Vamic2Ena                = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUDIOSUPPLY, 0x00),

	/*

	 * Vamic1_dzout             = high-Z when Vamic1 is disabled

	 * Vamic2_dzout             = high-Z when Vamic2 is disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x00),

	/*

	 * VPll                     = Hw controlled

	 * VanaRegu                 = force off

	 */

	INIT_REGULATOR_REGISTER(AB8500_VPLLVANAREGU, 0x02),

	/*

	 * VrefDDREna               = disabled

	 * VrefDDRSleepMode         = inactive (no pulldown)

	 */

	INIT_REGULATOR_REGISTER(AB8500_VREFDDR, 0x00),

	/*

	 * VextSupply1Regu          = HW control

	 * VextSupply2Regu          = HW control

	 * VextSupply3Regu          = HW control

	 * ExtSupply2Bypass         = ExtSupply12LPn ball is 0 when Ena is 0

	 * ExtSupply3Bypass         = ExtSupply3LPn ball is 0 when Ena is 0

	 */

	INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0x2a),

	/*

	 * Vaux1Regu                = force HP

	 * Vaux2Regu                = force off

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x01),

	/*

	 * Vaux3regu                = force off

	 */

	INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x00),

	/*

	 * Vsmps1                   = 1.15V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VSMPS1SEL1, 0x24),

	/*

	 * Vaux1Sel                 = 2.5 V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUX1SEL, 0x08),

	/*

	 * Vaux2Sel                 = 2.9 V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUX2SEL, 0x0d),

	/*

	 * Vaux3Sel                 = 2.91 V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3SEL, 0x07),

	/*

	 * VextSupply12LP           = disabled (no LP)

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRL2SPARE, 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(AB8500_REGUCTRLDISCH, 0x00),

	/*

	 * VanaDisch                = short discharge time

	 * VdmicPullDownEna         = pulldown disabled when Vdmic is disabled

	 * VdmicDisch               = short discharge time

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2, 0x00),

};



/* AB8500 regulators */

struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {

	/* supplies to the display/camera */
@@ -72,6 +248,7 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { 
			.max_uV = 2900000,

			.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

					  REGULATOR_CHANGE_STATUS,

			.boot_on = 1, /* must be on for display */

		},

		.num_consumer_supplies = ARRAY_SIZE(ab8500_vaux1_consumers),

		.consumer_supplies = ab8500_vaux1_consumers,

arch/arm/mach-ux500/board-mop500.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { 


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),

	.gpio		= &ab8500_gpio_pdata,