scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-13 03:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

octopus: moving hibernate code to baseboard

Browse Source 
bip also need to enable the sink path when going into hibernate

BRANCH=none
BUG=b:79948623
TEST=on bip, verfied that AC_OK, LID_OPEN, and POWER_BTN all wake the EC
up.

Change-Id: I2c1168f856cc45635b5c76f7ca409007fcf141cc
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1065203
This commit is contained in:
Jett Rink
2018-05-17 18:17:45 -07:00
committed by chrome-bot
parent 4a65a62f85
commit 89275aff03
3 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
baseboard/octopus/baseboard.c
View File

@@ -7,9 +7,11 @@
#include "charge_manager.h"
#include "charge_state.h"
#include "chipset.h"
#include "common.h"
#include "console.h"
#include "driver/bc12/bq24392.h"
#include "driver/ppc/nx20p3483.h"
#include "gpio.h"
#include "hooks.h"
#include "keyboard_scan.h"
@@ -17,6 +19,7 @@
#include "system.h"
#include "task.h"
#include "usb_mux.h"
#include "usb_pd.h"
#include "usbc_ppc.h"
#include "util.h"
@@ -277,3 +280,43 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
CONFIG_CHARGER_INPUT_CURRENT),
charge_mv);
}
void board_hibernate(void)
{
int port;
/*
* To support hibernate called from console commands, ectool commands
* and key sequence, shutdown the AP before hibernating.
*/
chipset_force_shutdown();
#ifdef CONFIG_USBC_PPC_NX20P3483
/*
* If we are charging, then drop the Vbus level down to 5V to ensure
* that we don't get locked out of the 6.8V OVLO for our PPCs in
* dead-battery mode. This is needed when the TCPC/PPC rails go away.
* (b/79218851)
*/
port = charge_manager_get_active_charge_port();
if (port != CHARGE_PORT_NONE)
pd_request_source_voltage(port, NX20P3483_SAFE_RESET_VBUS_MV);
#endif
/*
* Delay allows AP power state machine to settle down along
* with any PD contract renegotiation.
*/
msleep(100);
for (port = 0; port < CONFIG_USB_PD_PORT_COUNT; port++) {
/*
* If Vbus isn't already on this port, then open the SNK path
* to allow AC to pass through to the charger when connected.
* This is need if the TCPC/PPC rails do not go away.
* (b/79173959)
*/
if (!pd_is_vbus_present(port))
ppc_vbus_sink_enable(port, 1);
}
}

45
baseboard/octopus/variant_ec_npcx796fb.c
View File

@@ -6,13 +6,10 @@
/* Common code for VARIANT_OCTOPUS_EC_NPCX796FB configuration */
#include "charge_manager.h"
#include "chipset.h"
#include "config.h"
#include "gpio.h"
#include "i2c.h"
#include "power.h"
#include "pwm_chip.h"
#include "usb_pd.h"
#include "usbc_ppc.h"
#include "util.h"
#include "timer.h"
@@ -35,45 +32,3 @@ const struct pwm_t pwm_channels[] = {
[PWM_CH_KBLIGHT] = { .channel = 3, .flags = 0, .freq = 100 },
};
BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
/******************************************************************************/
/* Board power callback/hooks */
#define HIBERNATE_VBUS_LEVEL_MV 5000
void board_hibernate(void)
{
int port;
/*
* To support hibernate called from console commands, ectool commands
* and key sequence, shutdown the AP before hibernating.
*/
chipset_force_shutdown();
/*
* If we are charging, then drop the Vbus level down to 5V to ensure
* that we don't get locked out of the 6.8V OVLO for our PPCs in
* dead-battery mode. This is needed when the TCPC/PPC rails go away.
* (b/79218851)
*/
port = charge_manager_get_active_charge_port();
if (port != CHARGE_PORT_NONE)
pd_request_source_voltage(port, HIBERNATE_VBUS_LEVEL_MV);
/*
* Delay allows AP power state machine to settle down along
* with any PD contract renegotiation.
*/
msleep(100);
for (port = 0; port < CONFIG_USB_PD_PORT_COUNT; port++) {
/*
* If Vbus isn't already on this port, then open the SNK path
* to allow AC to pass through to the charger when connected.
* This is need if the TCPC/PPC rails do not go away.
* (b/79173959)
*/
if (!pd_is_vbus_present(port))
ppc_vbus_sink_enable(port, 1);
}
}

7
driver/ppc/nx20p3483.h
View File

@@ -13,6 +13,13 @@
#define NX20P3483_ADDR2 0xE4
#define NX20P3483_ADDR3 0xE6
/*
* This PPC hard-codes the over voltage protect of Vbus at 6.8V in dead-battery
* mode. If we ever are every going to drop the PD rail, we need to first ensure
* that Vbus is negotiated to below 6.8V otherwise we can lock out Vbus.
*/
#define NX20P3483_SAFE_RESET_VBUS_MV 5000
/* NX20P3483 register addresses */
#define NX20P3483_DEVICE_ID_REG 0x00
#define NX20P3483_DEVICE_STATUS_REG 0x01