len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

imx233: rework power management for work on stmp3700

Browse source 
Change-Id: Ia1f7e8b633dfe6ef8dc840b3eb22eaf79c53ce6b
This commit is contained in:
Amaury Pouly 2013-12-01 22:37:36 +00:00
parent 2ce484c658
commit 3f55f01e92
1 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
firmware/target/arm/imx233/powermgmt-imx233.c
View file

@ -68,16 +68,22 @@ void imx233_powermgmt_init(void)
#endif #endif
#if IMX233_SUBTARGET >= 3780 #if IMX233_SUBTARGET >= 3780
/* adjust arbitration between 4.2 and battery */
BF_WR(POWER_DCDC4P2, CMPTRIP, 0); /* 85% */
BF_WR(POWER_DCDC4P2, DROPOUT_CTRL, 0xe); /* select greater, 200 mV drop */
#endif
#if IMX233_SUBTARGET >= 3700
/* enable a few bits controlling the DC-DC as recommended by Freescale */ /* enable a few bits controlling the DC-DC as recommended by Freescale */
BF_SET(POWER_LOOPCTRL, TOGGLE_DIF); BF_SET(POWER_LOOPCTRL, TOGGLE_DIF);
BF_SET(POWER_LOOPCTRL, EN_CM_HYST); BF_SET(POWER_LOOPCTRL, EN_CM_HYST);
BF_CLR(POWER_LOOPCTRL, EN_RCSCALE); BF_CLR(POWER_LOOPCTRL, EN_RCSCALE);
BF_SETV(POWER_LOOPCTRL, EN_RCSCALE, 1); BF_SETV(POWER_LOOPCTRL, EN_RCSCALE, 1);
/* adjust arbitration between 4.2 and battery */ /* make sure we are in a known state: disable charger */
BF_WR(POWER_DCDC4P2, CMPTRIP, 0); /* 85% */
BF_WR(POWER_DCDC4P2, DROPOUT_CTRL, 0xe); /* select greater, 200 mV drop */
/* make sure we are in a known state: disable charger and 4p2 */
BF_SET(POWER_CHARGE, PWD_BATTCHRG); BF_SET(POWER_CHARGE, PWD_BATTCHRG);
#endif
#if IMX233_SUBTARGET >= 3780
/* make sure we are in a known state: disable 4p2 */
BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 0); BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 0);
BF_WR(POWER_DCDC4P2, ENABLE_4P2, 0); BF_WR(POWER_DCDC4P2, ENABLE_4P2, 0);
BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2); BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2);
@ -91,7 +97,6 @@ void powermgmt_init_target(void)
void charging_algorithm_step(void) void charging_algorithm_step(void)
{ {
#if IMX233_SUBTARGET >= 3780
bool is_5v_present = usb_detect() == USB_INSERTED; bool is_5v_present = usb_detect() == USB_INSERTED;
/* initial state & 5v -> battery transition */ /* initial state & 5v -> battery transition */
@ -101,9 +106,11 @@ void charging_algorithm_step(void)
logf("pwrmgmt: disable charger and 4p2"); logf("pwrmgmt: disable charger and 4p2");
/* 5V has been lost: disable 4p2 power rail */ /* 5V has been lost: disable 4p2 power rail */
BF_SET(POWER_CHARGE, PWD_BATTCHRG); BF_SET(POWER_CHARGE, PWD_BATTCHRG);
#if IMX233_SUBTARGET >= 3780
BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 0); BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 0);
BF_WR(POWER_DCDC4P2, ENABLE_4P2, 0); BF_WR(POWER_DCDC4P2, ENABLE_4P2, 0);
BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2); BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2);
#endif
charge_state = DISCHARGING; charge_state = DISCHARGING;
} }
/* battery -> 5v transition */ /* battery -> 5v transition */
@ -111,17 +118,20 @@ void charging_algorithm_step(void)
{ {
logf("pwrmgmt: discharging -> trickle"); logf("pwrmgmt: discharging -> trickle");
logf("pwrmgmt: begin charging 4p2"); logf("pwrmgmt: begin charging 4p2");
#if IMX233_SUBTARGET >= 3780
/* 5V has been detected: prepare 4.2V power rail for activation */ /* 5V has been detected: prepare 4.2V power rail for activation */
BF_WR(POWER_DCDC4P2, ENABLE_4P2, 1); BF_WR(POWER_DCDC4P2, ENABLE_4P2, 1);
BF_SET(POWER_CHARGE, ENABLE_LOAD); BF_SET(POWER_CHARGE, ENABLE_LOAD);
BF_WR(POWER_5VCTRL, CHARGE_4P2_ILIMIT, 1); BF_WR(POWER_5VCTRL, CHARGE_4P2_ILIMIT, 1);
BF_CLR(POWER_5VCTRL, PWD_CHARGE_4P2);// FIXME: manual error ? BF_CLR(POWER_5VCTRL, PWD_CHARGE_4P2);// FIXME: manual error ?
BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 1); BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 1);
#endif
timeout_4p2_ilimit_increase = current_tick + HZ / 100; timeout_4p2_ilimit_increase = current_tick + HZ / 100;
charge_state = TRICKLE; charge_state = TRICKLE;
} }
else if(charge_state == TRICKLE && TIME_AFTER(current_tick, timeout_4p2_ilimit_increase)) else if(charge_state == TRICKLE && TIME_AFTER(current_tick, timeout_4p2_ilimit_increase))
{ {
#if IMX233_SUBTARGET >= 3780
/* if 4.2V current limit has not reached 780mA, increase it slowly to /* if 4.2V current limit has not reached 780mA, increase it slowly to
* charge the 4.2V capacitance */ * charge the 4.2V capacitance */
if(BF_RD(POWER_5VCTRL, CHARGE_4P2_ILIMIT) != 0x3f) if(BF_RD(POWER_5VCTRL, CHARGE_4P2_ILIMIT) != 0x3f)
@ -132,6 +142,7 @@ void charging_algorithm_step(void)
} }
/* we've reached the maximum, take action */ /* we've reached the maximum, take action */
else else
#endif
{ {
logf("pwrmgmt: enable dcdc and charger"); logf("pwrmgmt: enable dcdc and charger");
logf("pwrmgmt: trickle -> charging"); logf("pwrmgmt: trickle -> charging");
@ -149,7 +160,10 @@ void charging_algorithm_step(void)
logf("pwrmgmt: charging timeout exceeded!"); logf("pwrmgmt: charging timeout exceeded!");
logf("pwrmgmt: charging -> error"); logf("pwrmgmt: charging -> error");
/* stop charging */ /* stop charging */
#if IMX233_SUBTARGET >= 3780
BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2); BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2);
#endif
BF_SET(POWER_CHARGE, PWD_BATTCHRG);
/* goto error state */ /* goto error state */
charge_state = CHARGE_STATE_ERROR; charge_state = CHARGE_STATE_ERROR;
} }
@ -165,10 +179,12 @@ void charging_algorithm_step(void)
logf("pwrmgmt: charging finished"); logf("pwrmgmt: charging finished");
logf("pwrmgmt: topoff -> disabled"); logf("pwrmgmt: topoff -> disabled");
/* stop charging */ /* stop charging */
#if IMX233_SUBTARGET >= 3780
BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2);
#endif
BF_SET(POWER_CHARGE, PWD_BATTCHRG); BF_SET(POWER_CHARGE, PWD_BATTCHRG);
charge_state = CHARGE_STATE_DISABLED; charge_state = CHARGE_STATE_DISABLED;
} }
#endif
} }
void charging_algorithm_close(void) void charging_algorithm_close(void)