veyron: Modify board config

This patch is base on new hardware board, veyron has not some stuff,
such as power led, charge en

BUG=None
TEST=Read log with servo board, it has reponse when type some commends
BRANCH=None

Change-Id: I45502fd1278f69db5e46fc9ab1deaee02fc8708f
Signed-off-by: zyw <zyw@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/209231
Reviewed-by: Alexandru Stan <amstan@google.com>
Commit-Queue: Alexandru Stan <amstan@google.com>
Tested-by: Alexandru Stan <amstan@google.com>

10 files changed, 684 insertions, 99 deletions

diff --git a/board/veyron/battery.c b/board/veyron/battery.c
index be6ba3ebdf..cbce0ce014 100644
--- a/board/veyron/battery.c
+++ b/board/veyron/battery.c
@@ -38,9 +38,9 @@ struct battery_device {
  */
 static struct battery_info info_precharge = {
 
-	.voltage_max    = 12900,  /* the max voltage among batteries */
-	.voltage_normal = 11400,
-	.voltage_min    =  9000,
+	.voltage_max    = 8600,  /* the max voltage among batteries */
+	.voltage_normal = 7600,
+	.voltage_min    =  6000,
 
 	/* Pre-charge values. */
 	.precharge_current  = 256,  /* mA, the min current among batteries */
diff --git a/board/veyron/board.c b/board/veyron/board.c
index 78a5df10bc..e3bbf02914 100644
--- a/board/veyron/board.c
+++ b/board/veyron/board.c
@@ -29,10 +29,11 @@
 
 #include "gpio_list.h"
 
+
 /* power signal list.  Must match order of enum power_signal. */
 const struct power_signal_info power_signal_list[] = {
-	{GPIO_SOC1V8_XPSHOLD, 1, "XPSHOLD"},
-	{GPIO_SUSPEND_L,      0, "SUSPEND#_ASSERTED"},
+	{GPIO_SOC_POWER_GOOD, 1, "POWER_GOOD"},
+	{GPIO_SUSPEND_L,      1, "SUSPEND#_ASSERTED"},
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
@@ -45,7 +46,7 @@ const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
 const struct pwm_t pwm_channels[] = {
 	{STM32_TIM(2), STM32_TIM_CH(3),
-	 PWM_CONFIG_ACTIVE_LOW, GPIO_LED_POWER_L},
+	 PWM_CONFIG_ACTIVE_LOW},
 };
 BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
 
diff --git a/board/veyron/board.h b/board/veyron/board.h
index 8972bc7eae..287189fa69 100644
--- a/board/veyron/board.h
+++ b/board/veyron/board.h
@@ -14,8 +14,8 @@
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_BQ24735
-#define CONFIG_CHIPSET_TEGRA
+#define CONFIG_CHARGER_BQ24715
+#define CONFIG_CHIPSET_ROCKCHIP
 #define CONFIG_POWER_COMMON
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_HOST_COMMAND_STATUS
@@ -48,8 +48,8 @@
 #include "gpio_signal.h"
 
 enum power_signal {
-	TEGRA_XPSHOLD = 0,
-	TEGRA_SUSPEND_ASSERTED,
+	RK_POWER_GOOD = 0,
+	RK_SUSPEND_ASSERTED,
 
 	/* Number of power signals */
 	POWER_SIGNAL_COUNT
diff --git a/board/veyron/build.mk b/board/veyron/build.mk
index 605af9c169..0d22b8bcbe 100644
--- a/board/veyron/build.mk
+++ b/board/veyron/build.mk
@@ -8,6 +8,6 @@
 # the IC is STmicro STM32L100RBT6
 CHIP:=stm32
 CHIP_FAMILY:=stm32l
-CHIP_VARIANT:=stm32l100
+CHIP_VARIANT:=stm32l15x
 
 board-y=board.o battery.o led.o
diff --git a/board/veyron/gpio.inc b/board/veyron/gpio.inc
index e35673e5fe..97a323c65e 100644
--- a/board/veyron/gpio.inc
+++ b/board/veyron/gpio.inc
@@ -7,9 +7,9 @@
 
 /* Inputs with interrupt handlers are first for efficiency */
 GPIO(POWER_BUTTON_L, B, 5,  GPIO_INT_BOTH,                power_button_interrupt)
-GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_BOTH,                power_signal_interrupt)
+GPIO(SOC_POWER_GOOD, A, 3,  GPIO_INT_BOTH ,               power_signal_interrupt)
 GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,                lid_interrupt)
-GPIO(SUSPEND_L,      C, 7,  GPIO_KB_INPUT,                power_signal_interrupt)
+GPIO(SUSPEND_L,      C, 7,  GPIO_INT_BOTH,                power_signal_interrupt)
 GPIO(SPI1_NSS,       A, 4,  GPIO_INT_BOTH | GPIO_PULL_UP, spi_event)
 GPIO(AC_PRESENT,     A, 0,  GPIO_INT_BOTH,                extpower_interrupt)
 
@@ -27,15 +27,12 @@ GPIO(KB_IN07, D, 2,  GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
 GPIO(WP_L, B, 4, GPIO_INPUT, NULL)
 
 /* Outputs */
-GPIO(AP_RESET_L,        B, 3,  GPIO_ODR_HIGH,  NULL)
-GPIO(CHARGER_EN,        B, 2,  GPIO_OUT_LOW,   NULL)
-GPIO(EC_INT,            B, 9,  GPIO_ODR_HIGH,  NULL)
+GPIO(AP_RESET_H,        B, 3,  GPIO_OUT_HIGH,  NULL)
+GPIO(EC_INT,            B, 9,  GPIO_OUT_HIGH,  NULL)
 GPIO(ENTERING_RW,       H, 0,  GPIO_OUT_LOW,   NULL)
 GPIO(I2C1_SCL,          B, 6,  GPIO_ODR_HIGH,  NULL)
 GPIO(I2C1_SDA,          B, 7,  GPIO_ODR_HIGH,  NULL)
-GPIO(LED_POWER_L,       A, 2,  GPIO_OUT_HIGH,  NULL)  /* PWR_LED1 */
 GPIO(PMIC_PWRON_L,      A, 12, GPIO_OUT_HIGH,  NULL)
-GPIO(PMIC_RESET,        A, 15, GPIO_OUT_LOW,   NULL)
 GPIO(KB_OUT00,          B, 0,  GPIO_KB_OUTPUT, NULL)
 GPIO(KB_OUT01,          B, 8,  GPIO_KB_OUTPUT, NULL)
 GPIO(KB_OUT02,          B, 12, GPIO_KB_OUTPUT, NULL)
@@ -49,13 +46,12 @@ GPIO(KB_OUT09,          B, 1,  GPIO_KB_OUTPUT, NULL)
 GPIO(KB_OUT10,          C, 5,  GPIO_KB_OUTPUT, NULL)
 GPIO(KB_OUT11,          C, 4,  GPIO_KB_OUTPUT, NULL)
 GPIO(KB_OUT12,          A, 13, GPIO_KB_OUTPUT, NULL)
-GPIO(PWR_LED0,          B, 10, GPIO_OUT_LOW,   NULL)
 GPIO(BAT_LED0,          B, 11, GPIO_OUT_LOW,   NULL)
-GPIO(BAT_LED1,          A, 8,  GPIO_OUT_LOW,   NULL)
-GPIO(CHARGING,          A, 11, GPIO_OUT_LOW,   NULL)
-GPIO(EC_BL_OVERRIDE,    H, 1,  GPIO_ODR_HIGH,  NULL)
-GPIO(PMIC_THERM_L,      A, 1,  GPIO_ODR_HIGH,  NULL)
-GPIO(PMIC_WARM_RESET_L, C, 3,  GPIO_ODR_HIGH,  NULL)
+GPIO(BAT_LED1,          A, 11, GPIO_OUT_LOW,   NULL)
+GPIO(EC_BL_OVERRIDE,    H, 1,  GPIO_OUT_HIGH,  NULL)
+GPIO(PMIC_THERM_H,      B, 10, GPIO_OUT_LOW,  NULL)
+GPIO(PMIC_WARM_RESET_L, C, 3,  GPIO_OUT_HIGH,  NULL)
+GPIO(PMIC_USB_CTRL1_H,  C, 6,  GPIO_OUT_HIGH,  NULL)
 
 ALTERNATE(A, 0x00f0, GPIO_ALT_SPI,   MODULE_SPI,  GPIO_DEFAULT)
 ALTERNATE(A, 0x0600, GPIO_ALT_USART, MODULE_UART, GPIO_DEFAULT)
diff --git a/board/veyron/led.c b/board/veyron/led.c
index aebc2d3251..a50a716d3e 100644
--- a/board/veyron/led.c
+++ b/board/veyron/led.c
@@ -14,13 +14,13 @@
 #include "util.h"
 
 const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_BATTERY_LED, EC_LED_ID_POWER_LED};
+	EC_LED_ID_BATTERY_LED};
 
 const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
 enum led_color {
 	LED_OFF = 0,
-	LED_BLUE,
+	LED_GREEN,
 	LED_ORANGE,
 	LED_COLOR_COUNT  /* Number of colors, not a color itself */
 };
@@ -29,37 +29,16 @@ static int bat_led_set_color(enum led_color color)
 {
 	switch (color) {
 	case LED_OFF:
-		gpio_set_level(GPIO_CHARGING, 0);
-		gpio_set_level(GPIO_BAT_LED1, 0);
-		break;
-	case LED_BLUE:
-		gpio_set_level(GPIO_CHARGING, 0);
+		gpio_set_level(GPIO_BAT_LED0, 1);
 		gpio_set_level(GPIO_BAT_LED1, 1);
 		break;
-	case LED_ORANGE:
-		gpio_set_level(GPIO_CHARGING, 1);
+	case LED_GREEN:
+		gpio_set_level(GPIO_BAT_LED0, 1);
 		gpio_set_level(GPIO_BAT_LED1, 0);
 		break;
-	default:
-		return EC_ERROR_UNKNOWN;
-	}
-	return EC_SUCCESS;
-}
-
-static int pwr_led_set_color(enum led_color color)
-{
-	switch (color) {
-	case LED_OFF:
-		gpio_set_level(GPIO_LED_POWER_L, 0);
-		gpio_set_level(GPIO_PWR_LED0, 0);
-		break;
-	case LED_BLUE:
-		gpio_set_level(GPIO_LED_POWER_L, 1);
-		gpio_set_level(GPIO_PWR_LED0, 0);
-		break;
 	case LED_ORANGE:
-		gpio_set_level(GPIO_LED_POWER_L, 0);
-		gpio_set_level(GPIO_PWR_LED0, 1);
+		gpio_set_level(GPIO_BAT_LED0, 0);
+		gpio_set_level(GPIO_BAT_LED1, 1);
 		break;
 	default:
 		return EC_ERROR_UNKNOWN;
@@ -67,55 +46,28 @@ static int pwr_led_set_color(enum led_color color)
 	return EC_SUCCESS;
 }
 
+
 void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
 {
 	/* Ignoring led_id as both leds support the same colors */
-	brightness_range[EC_LED_COLOR_BLUE] = 1;
+	brightness_range[EC_LED_COLOR_GREEN] = 1;
 	brightness_range[EC_LED_COLOR_YELLOW] = 1;
 }
 
 int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 {
-	switch (led_id) {
-	case EC_LED_ID_BATTERY_LED:
-		if (brightness[EC_LED_COLOR_BLUE] != 0)
-			bat_led_set_color(LED_BLUE);
+	if (EC_LED_ID_BATTERY_LED == led_id) {
+		if (brightness[EC_LED_COLOR_GREEN] != 0)
+			bat_led_set_color(LED_GREEN);
 		else if (brightness[EC_LED_COLOR_YELLOW] != 0)
 			bat_led_set_color(LED_ORANGE);
 		else
 			bat_led_set_color(LED_OFF);
-		break;
-	case EC_LED_ID_POWER_LED:
-		if (brightness[EC_LED_COLOR_BLUE] != 0)
-			pwr_led_set_color(LED_BLUE);
-		else if (brightness[EC_LED_COLOR_YELLOW] != 0)
-			pwr_led_set_color(LED_ORANGE);
-		else
-			pwr_led_set_color(LED_OFF);
-		break;
-	default:
+		return EC_SUCCESS;
+	} else {
 		return EC_ERROR_UNKNOWN;
 	}
-	return EC_SUCCESS;
-}
-
-static void veyron_led_set_power(void)
-{
-	static int power_second;
-
-	power_second++;
 
-	/* PWR LED behavior:
-	 * Power on: Blue
-	 * Suspend: Orange in breeze mode ( 1 sec on/ 3 sec off)
-	 * Power off: OFF
-	 */
-	if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
-		pwr_led_set_color(LED_OFF);
-	else if (chipset_in_state(CHIPSET_STATE_ON))
-		pwr_led_set_color(LED_BLUE);
-	else if (chipset_in_state(CHIPSET_STATE_SUSPEND))
-		pwr_led_set_color((power_second & 3) ? LED_OFF : LED_ORANGE);
 }
 
 static void veyron_led_set_battery(void)
@@ -152,14 +104,14 @@ static void veyron_led_set_battery(void)
 		bat_led_set_color((battery_second & 1) ? LED_OFF : LED_ORANGE);
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
-		bat_led_set_color(LED_BLUE);
+		bat_led_set_color(LED_GREEN);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE. */
 		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			bat_led_set_color(
-				(battery_second & 0x2) ? LED_BLUE : LED_ORANGE);
+			bat_led_set_color((battery_second & 0x2)
+					? LED_GREEN : LED_ORANGE);
 		else
-			bat_led_set_color(LED_BLUE);
+			bat_led_set_color(LED_GREEN);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
@@ -170,8 +122,6 @@ static void veyron_led_set_battery(void)
 /**  * Called by hook task every 1 sec  */
 static void led_second(void)
 {
-	if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
-		veyron_led_set_power();
 	if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
 		veyron_led_set_battery();
 }
diff --git a/include/config.h b/include/config.h
index 641660da13..812650da82 100644
--- a/include/config.h
+++ b/include/config.h
@@ -283,6 +283,7 @@
 #undef CONFIG_CHIPSET_GAIA      /* Gaia and Ares (ARM) */
 #undef CONFIG_CHIPSET_HASWELL   /* Intel Haswell (x86) */
 #undef CONFIG_CHIPSET_IVYBRIDGE /* Intel Ivy Bridge (x86) */
+#undef CONFIG_CHIPSET_ROCKCHIP  /* Rockchip rk32xx */
 #undef CONFIG_CHIPSET_TEGRA     /* nVidia Tegra 5 */
 
 /* Support chipset throttling */
diff --git a/power/build.mk b/power/build.mk
index 5819b623c1..e97371d125 100644
--- a/power/build.mk
+++ b/power/build.mk
@@ -10,5 +10,6 @@ power-$(CONFIG_CHIPSET_BAYTRAIL)+=baytrail.o
 power-$(CONFIG_CHIPSET_GAIA)+=gaia.o
 power-$(CONFIG_CHIPSET_HASWELL)+=haswell.o
 power-$(CONFIG_CHIPSET_IVYBRIDGE)+=ivybridge.o
+power-$(CONFIG_CHIPSET_ROCKCHIP)+=rockchip.o
 power-$(CONFIG_CHIPSET_TEGRA)+=tegra.o
 power-$(CONFIG_POWER_COMMON)+=common.o
diff --git a/power/rockchip.c b/power/rockchip.c
new file mode 100644
index 0000000000..38fa3461d9
--- /dev/null
+++ b/power/rockchip.c
@@ -0,0 +1,635 @@
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/*
+ * Rockchip SoC power sequencing module for Chrome EC
+ *
+ * This implements the following features:
+ *
+ * - Cold reset powers on the AP
+ *
+ *  When powered off:
+ *  - Press pwron turns on the AP
+ *  - Hold pwron turns on the AP, and then 9s later turns it off and leaves
+ *    it off until pwron is released and pressed again
+ *
+ *  When powered on:
+ *  - The PMIC PWRON signal is released <= 1 second after the power button is
+ *    released
+ *  - Holding pwron for 10.2s powers off the AP
+ *  - Pressing and releasing pwron within that 10.2s is ignored
+ *  - If POWER_GOOD is dropped by the pmic, then we cut off the pmic source
+ *  - If SUSPEND_L goes low, enter suspend mode.
+ *
+ */
+
+#include "battery.h"
+#include "charge_state.h"
+#include "chipset.h"  /* This module implements chipset functions too */
+#include "clock.h"
+#include "common.h"
+#include "console.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "lid_switch.h"
+#include "keyboard_scan.h"
+#include "power.h"
+#include "power_button.h"
+#include "power_led.h"
+#include "system.h"
+#include "task.h"
+#include "timer.h"
+#include "util.h"
+
+/* Console output macros */
+#define CPUTS(outstr) cputs(CC_CHIPSET, outstr)
+#define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
+
+/* masks for power signals */
+#define IN_POWER_GOOD POWER_SIGNAL_MASK(RK_POWER_GOOD)
+#define IN_SUSPEND POWER_SIGNAL_MASK(RK_SUSPEND_ASSERTED)
+
+/* Long power key press to force shutdown */
+#define DELAY_FORCE_SHUTDOWN  (10200 * MSEC)  /* 10.2 seconds */
+
+/*
+ * The minimum time to assert the PMIC PWRON pin is 20ms.
+ * Give it longer to ensure the PMIC doesn't lose it.
+ */
+#define PMIC_PWRON_DEBOUNCE_TIME  (200 * MSEC * 3)
+
+/*
+ * The minimum time to assert the PMIC THERM pin is 32us. However,
+ * it needs to be extended to about 50ms to let the 5V rail
+ * dissipate fully.
+ */
+#define PMIC_THERM_HOLD_TIME  (50 * MSEC)
+
+/*
+ * If the power key is pressed to turn on, then held for this long, we
+ * power off.
+ *
+ * Normal case: User releases power button and chipset_task() goes
+ *    into the inner loop, waiting for next event to occur (power button
+ *    press or power good == 0).
+ */
+#define DELAY_SHUTDOWN_ON_POWER_HOLD	(10200 * MSEC)  /* 10.2 seconds */
+
+/*
+ * The hold time for pulling down the PMIC_WARM_RESET_L pin so that
+ * the AP can entery the recovery mode (flash SPI flash from USB).
+ */
+#define PMIC_WARM_RESET_L_HOLD_TIME (4 * MSEC)
+
+/*
+ * The first time the PMIC sees power (AC or battery) it needs 200ms (+/-12%
+ * oscillator tolerance) for the RTC startup. In addition there is a startup
+ * time of approx. 0.5msec until V2_5 regulator starts up. */
+#define PMIC_RTC_STARTUP (225 * MSEC)
+
+/* TODO(crosbug.com/p/25047): move to HOOK_POWER_BUTTON_CHANGE */
+/* 1 if the power button was pressed last time we checked */
+static char power_button_was_pressed;
+
+/* 1 if lid-open event has been detected */
+static char lid_opened;
+
+/* time where we will power off, if power button still held down */
+static timestamp_t power_off_deadline;
+
+/* force AP power on (used for recovery keypress) */
+static int auto_power_on;
+
+enum power_request_t {
+	POWER_REQ_NONE,
+	POWER_REQ_OFF,
+	POWER_REQ_ON,
+
+	POWER_REQ_COUNT,
+};
+
+static enum power_request_t power_request;
+
+
+/* Forward declaration */
+static void chipset_turn_off_power_rails(void);
+
+
+/**
+ * Set the AP RESET signal.
+ *
+ * This fucntion is for backward-compatible.
+ *
+ * AP_RESET_L (PB3) is stuffed before rev <= 2.0 and connected to PMIC RESET.
+ * After rev >= 2.2, this is removed. This should not effected the new board.
+ *
+ * @param asserted  Assert (=1) or deassert (=0) the signal.  This is the
+ *                  logical level of the pin, not the physical level.
+ */
+static void set_ap_reset(int asserted)
+{
+	/* Signal is active-high */
+	gpio_set_level(GPIO_AP_RESET_H, asserted ? 1 : 0);
+}
+
+
+/**
+ * Set the PMIC PWRON signal.
+ *
+ * Note that asserting requires holding for PMIC_PWRON_DEBOUNCE_TIME.
+ *
+ * @param asserted	Assert (=1) or deassert (=0) the signal.  This is the
+ *			logical level of the pin, not the physical level.
+ */
+static void set_pmic_pwron(int asserted)
+{
+	/* Signal is active-low */
+	gpio_set_level(GPIO_PMIC_PWRON_L, asserted ? 0 : 1);
+}
+
+/**
+ * Set the PMIC source to force shutdown the AP.
+ *
+ * @param asserted	Assert (=1) or deassert (=0) the signal.  This is the
+ *			logical level of the pin, not the physical level.
+ */
+static void set_pmic_source(int asserted)
+{
+	/* Signal is active-high */
+	gpio_set_level(GPIO_PMIC_THERM_H, asserted ? 1 : 0);
+}
+
+/**
+ * Check for some event triggering the shutdown.
+ *
+ * It can be either a long power button press or a shutdown triggered from the
+ * AP and detected by reading POWER_GOOD.
+ *
+ * @return non-zero if a shutdown should happen, 0 if not
+ */
+static int check_for_power_off_event(void)
+{
+	timestamp_t now;
+	int pressed = 0;
+
+	/*
+	 * Check for power button press.
+	 */
+	if (power_button_is_pressed()) {
+		pressed = 1;
+	} else if (power_request == POWER_REQ_OFF) {
+		power_request = POWER_REQ_NONE;
+		return 4;  /* return non-zero for shudown down */
+	}
+
+#ifdef HAS_TASK_KEYSCAN
+	/* Dis/Enable keyboard scanning when the power button state changes */
+	if (!pressed || pressed != power_button_was_pressed)
+		keyboard_scan_enable(!pressed, KB_SCAN_DISABLE_POWER_BUTTON);
+#endif
+
+	now = get_time();
+	if (pressed) {
+		set_pmic_pwron(1);
+		usleep(PMIC_PWRON_DEBOUNCE_TIME);
+
+		if (!power_button_was_pressed) {
+			power_off_deadline.val = now.val + DELAY_FORCE_SHUTDOWN;
+			CPRINTS("power waiting for long press %u",
+				power_off_deadline.le.lo);
+		} else if (timestamp_expired(power_off_deadline, &now)) {
+			power_off_deadline.val = 0;
+			CPRINTS("power off after long press now=%u, %u",
+				now.le.lo, power_off_deadline.le.lo);
+			return 2;
+		}
+	} else if (power_button_was_pressed) {
+		CPRINTS("power off cancel");
+		set_pmic_pwron(0);
+	}
+
+	power_button_was_pressed = pressed;
+
+	/* POWER_GOOD released by AP : shutdown immediately */
+	if (!power_has_signals(IN_POWER_GOOD))
+		return 3;
+
+	return 0;
+}
+
+static void rockchip_lid_event(void)
+{
+	/* Power task only cares about lid-open events */
+	if (!lid_is_open())
+		return;
+
+	lid_opened = 1;
+	task_wake(TASK_ID_CHIPSET);
+}
+DECLARE_HOOK(HOOK_LID_CHANGE, rockchip_lid_event, HOOK_PRIO_DEFAULT);
+
+enum power_state power_chipset_init(void)
+{
+	int init_power_state;
+	uint32_t reset_flags = system_get_reset_flags();
+
+	/*
+	 * Force the AP shutdown unless we are doing SYSJUMP. Otherwise,
+	 * the AP could stay in strange state.
+	 */
+	if (!(reset_flags & RESET_FLAG_SYSJUMP)) {
+		CPRINTS("not sysjump; forcing AP shutdown");
+		chipset_turn_off_power_rails();
+
+		/*
+		 * The warm reset triggers AP into the RK recovery mode (
+		 * flash SPI from USB).
+		 */
+		chipset_reset(0);
+
+		init_power_state = POWER_G3;
+	} else {
+		/* In the SYSJUMP case, we check if the AP is on */
+		if (power_get_signals() & IN_POWER_GOOD)
+			init_power_state = POWER_S0;
+		else
+			init_power_state = POWER_G3;
+	}
+
+	/* Leave power off only if requested by reset flags */
+	if (!(reset_flags & RESET_FLAG_AP_OFF) &&
+	    !(reset_flags & RESET_FLAG_SYSJUMP)) {
+		CPRINTS("auto_power_on set due to reset_flag 0x%x",
+			system_get_reset_flags());
+		auto_power_on = 1;
+	}
+
+	/*
+	 * Some batteries use clock stretching feature, which requires
+	 * more time to be stable. See http://crosbug.com/p/28289
+	 */
+	battery_wait_for_stable();
+
+	return init_power_state;
+}
+
+/*****************************************************************************/
+/* Chipset interface */
+
+static void chipset_turn_off_power_rails(void)
+{
+	/* Release the power button, if it was asserted */
+	set_pmic_pwron(0);
+	/* Close the pmic power source immediately */
+	set_pmic_source(0);
+
+	/* Hold the reset pin so that the AP stays in off mode (rev <= 2.0) */
+	set_ap_reset(1);
+}
+
+void chipset_force_shutdown(void)
+{
+	chipset_turn_off_power_rails();
+
+	/* clean-up internal variable */
+	power_request = POWER_REQ_NONE;
+}
+
+/*****************************************************************************/
+
+/**
+ * Check if there has been a power-on event
+ *
+ * This checks all power-on event signals and returns non-zero if any have been
+ * triggered (with debounce taken into account).
+ *
+ * @return non-zero if there has been a power-on event, 0 if not.
+ */
+static int check_for_power_on_event(void)
+{
+	int ap_off_flag;
+
+	ap_off_flag = system_get_reset_flags() & RESET_FLAG_AP_OFF;
+	system_clear_reset_flags(RESET_FLAG_AP_OFF);
+	/* check if system is already ON */
+	if (power_get_signals() & IN_POWER_GOOD) {
+		if (ap_off_flag) {
+			CPRINTS(
+				"system is on, but "
+				"RESET_FLAG_AP_OFF is on");
+			return 0;
+		} else {
+			CPRINTS(
+				"system is on, thus clear "
+				"auto_power_on");
+			/* no need to arrange another power on */
+			auto_power_on = 0;
+			return 1;
+		}
+	}
+
+	/* power on requested at EC startup for recovery */
+	if (auto_power_on) {
+		auto_power_on = 0;
+		return 2;
+	}
+
+	/* Check lid open */
+	if (lid_opened) {
+		lid_opened = 0;
+		return 3;
+	}
+
+	/* check for power button press */
+	if (power_button_is_pressed())
+		return 4;
+
+	if (power_request == POWER_REQ_ON) {
+		power_request = POWER_REQ_NONE;
+		return 5;
+	}
+
+	return 0;
+}
+
+/**
+ * Power on the AP
+ */
+static void power_on(void)
+{
+	uint64_t t;
+
+	/* enable interrupt */
+	gpio_set_flags(GPIO_SUSPEND_L, GPIO_INPUT |	GPIO_INT_BOTH);
+	/* Make sure we de-assert the PMI_SOURCE and AP_RESET_L pin. */
+	set_pmic_source(1);
+	set_ap_reset(0);
+
+	/*
+	 * Before we push PMIC power button, wait for the PMI RTC ready, which
+	 * takes PMIC_RTC_STARTUP from the AC/battery is plugged in.
+	 */
+	t = get_time().val;
+	if (t < PMIC_RTC_STARTUP) {
+		uint32_t wait = PMIC_RTC_STARTUP - t;
+		CPRINTS("wait for %dms for PMIC RTC start-up",
+			wait / MSEC);
+		usleep(wait);
+	}
+
+	/*
+	 * When power_on() is called, we are at S5S3. Initialize components
+	 * to ready state before AP is up.
+	 */
+	hook_notify(HOOK_CHIPSET_PRE_INIT);
+	/* Change SPI1_NSS pin to high-Z to reduce power draw,
+	 * until AP running
+	 */
+	gpio_set_flags(GPIO_SPI1_NSS, GPIO_INPUT);
+	/* Push the power button */
+	set_pmic_pwron(1);
+	usleep(PMIC_PWRON_DEBOUNCE_TIME);
+	gpio_set_flags(GPIO_SPI1_NSS, GPIO_INPUT | GPIO_INT_BOTH
+			| GPIO_PULL_UP);
+	disable_sleep(SLEEP_MASK_AP_RUN);
+
+	powerled_set_state(POWERLED_STATE_ON);
+
+	/* Call hooks now that AP is running */
+	hook_notify(HOOK_CHIPSET_STARTUP);
+
+	CPRINTS("AP running ...");
+}
+
+/**
+ * Wait for the power button to be released
+ *
+ * @param timeout_us Timeout in microseconds, or -1 to wait forever
+ * @return EC_SUCCESS if ok, or
+ *         EC_ERROR_TIMEOUT if power button failed to release
+ */
+static int wait_for_power_button_release(unsigned int timeout_us)
+{
+	timestamp_t deadline;
+	timestamp_t now = get_time();
+
+	deadline.val = now.val + timeout_us;
+
+	while (power_button_is_pressed()) {
+		now = get_time();
+		if (timeout_us < 0) {
+			task_wait_event(-1);
+		} else if (timestamp_expired(deadline, &now) ||
+			(task_wait_event(deadline.val - now.val) ==
+			TASK_EVENT_TIMER)) {
+			CPRINTS("power button not released in time");
+			return EC_ERROR_TIMEOUT;
+		}
+	}
+
+	CPRINTS("power button released");
+	power_button_was_pressed = 0;
+	return EC_SUCCESS;
+}
+
+/**
+ * Power off the AP
+ */
+static void power_off(void)
+{
+	/* Call hooks before we drop power rails */
+	hook_notify(HOOK_CHIPSET_SHUTDOWN);
+	/* switch off all rails */
+	chipset_turn_off_power_rails();
+	/* Change SUSPEND_L pin to high-Z to reduce power draw. */
+	gpio_set_flags(GPIO_SUSPEND_L, GPIO_INPUT);
+
+	lid_opened = 0;
+	enable_sleep(SLEEP_MASK_AP_RUN);
+	powerled_set_state(POWERLED_STATE_OFF);
+	/* Wait POWER GOOD pin to low */
+	usleep(PMIC_THERM_HOLD_TIME);
+	CPRINTS("power shutdown complete");
+}
+
+void chipset_reset(int is_cold)
+{
+	if (is_cold) {
+		CPRINTS("EC triggered cold reboot");
+		power_off();
+		/* After POWER_GOOD is dropped off,
+		 * the system will be on again
+		 */
+		power_request = POWER_REQ_ON;
+	} else {
+		CPRINTS("EC triggered warm reboot");
+		CPRINTS("assert GPIO_PMIC_WARM_RESET_L for %d ms",
+				PMIC_WARM_RESET_L_HOLD_TIME / MSEC);
+		gpio_set_level(GPIO_PMIC_WARM_RESET_L, 0);
+		usleep(PMIC_WARM_RESET_L_HOLD_TIME);
+		gpio_set_level(GPIO_PMIC_WARM_RESET_L, 1);
+	}
+}
+
+enum power_state power_handle_state(enum power_state state)
+{
+	int value;
+	static int boot_from_g3;
+
+	switch (state) {
+	case POWER_G3:
+		boot_from_g3 = check_for_power_on_event();
+		if (boot_from_g3)
+			return POWER_G3S5;
+		break;
+
+	case POWER_G3S5:
+		return POWER_S5;
+
+	case POWER_S5:
+		if (boot_from_g3) {
+			value = boot_from_g3;
+			boot_from_g3 = 0;
+		} else {
+			value = check_for_power_on_event();
+		}
+
+		if (value) {
+			CPRINTS("power on %d", value);
+			return POWER_S5S3;
+		}
+		return state;
+
+	case POWER_S5S3:
+		power_on();
+		if (power_wait_signals(IN_POWER_GOOD) == EC_SUCCESS) {
+			CPRINTS("POWER_GOOD seen");
+			if (wait_for_power_button_release(
+					DELAY_SHUTDOWN_ON_POWER_HOLD) ==
+					EC_SUCCESS) {
+				set_pmic_pwron(0);
+				return POWER_S3;
+			} else {
+				CPRINTS("long-press button, shutdown");
+				power_off();
+				/*
+				 * Since the AP may be up already, return S0S3
+				 * state to go through the suspend hook.
+				 */
+				return POWER_S0S3;
+			}
+		} else {
+			CPRINTS("POWER_GOOD not seen in time");
+		}
+		set_pmic_pwron(0);
+		return POWER_S5;
+
+	case POWER_S3:
+		if (!(power_get_signals() & IN_POWER_GOOD))
+			return POWER_S3S5;
+		else if (!(power_get_signals() & IN_SUSPEND))
+			return POWER_S3S0;
+		return state;
+
+	case POWER_S3S0:
+		powerled_set_state(POWERLED_STATE_ON);
+		hook_notify(HOOK_CHIPSET_RESUME);
+		return POWER_S0;
+
+	case POWER_S0:
+		value = check_for_power_off_event();
+		if (value) {
+			CPRINTS("power off %d", value);
+			power_off();
+			return POWER_S0S3;
+		} else if (power_get_signals() & IN_SUSPEND)
+			return POWER_S0S3;
+		return state;
+
+	case POWER_S0S3:
+		if (lid_is_open())
+			powerled_set_state(POWERLED_STATE_SUSPEND);
+		else
+			powerled_set_state(POWERLED_STATE_OFF);
+		/* Call hooks here since we don't know it prior to AP suspend */
+		hook_notify(HOOK_CHIPSET_SUSPEND);
+		return POWER_S3;
+
+	case POWER_S3S5:
+		wait_for_power_button_release(-1);
+		return POWER_S5;
+
+	case POWER_S5G3:
+		return POWER_G3;
+	}
+
+	return state;
+}
+
+static void powerbtn_rockchip_changed(void)
+{
+	task_wake(TASK_ID_CHIPSET);
+}
+DECLARE_HOOK(HOOK_POWER_BUTTON_CHANGE, powerbtn_rockchip_changed,
+		HOOK_PRIO_DEFAULT);
+
+/*****************************************************************************/
+/* Console debug command */
+
+static const char *power_req_name[POWER_REQ_COUNT] = {
+	"none",
+	"off",
+	"on",
+};
+
+/* Power states that we can report */
+enum power_state_t {
+	PSTATE_UNKNOWN,
+	PSTATE_OFF,
+	PSTATE_SUSPEND,
+	PSTATE_ON,
+
+	PSTATE_COUNT,
+};
+
+static const char * const state_name[] = {
+	"unknown",
+	"off",
+	"suspend",
+	"on",
+};
+
+static int command_power(int argc, char **argv)
+{
+	int v;
+
+	if (argc < 2) {
+		enum power_state_t state;
+
+		state = PSTATE_UNKNOWN;
+		if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
+			state = PSTATE_OFF;
+		if (chipset_in_state(CHIPSET_STATE_SUSPEND))
+			state = PSTATE_SUSPEND;
+		if (chipset_in_state(CHIPSET_STATE_ON))
+			state = PSTATE_ON;
+		ccprintf("%s\n", state_name[state]);
+
+		return EC_SUCCESS;
+	}
+
+	if (!parse_bool(argv[1], &v))
+		return EC_ERROR_PARAM1;
+
+	power_request = v ? POWER_REQ_ON : POWER_REQ_OFF;
+	ccprintf("Requesting power %s\n", power_req_name[power_request]);
+	task_wake(TASK_ID_CHIPSET);
+
+	return EC_SUCCESS;
+}
+DECLARE_CONSOLE_COMMAND(power, command_power,
+			"on/off",
+			"Turn AP power on/off",
+			NULL);
diff --git a/util/stm32mon.c b/util/stm32mon.c
index f96dfdb88a..f13f9c3a0b 100644
--- a/util/stm32mon.c
+++ b/util/stm32mon.c
@@ -53,13 +53,14 @@ struct stm32_def {
 	uint32_t flash_size;
 	uint32_t page_size;
 } chip_defs[] = {
-	{0x416, "STM32L15xxB", 0x08000000, 0x20000, 256},
-	{0x427, "STM32L15xxC", 0x08000000, 0x40000, 256},
-	{0x420, "STM32F100xx", 0x08000000, 0x20000, 1024},
-	{0x410, "STM32F102R8", 0x08000000, 0x10000, 1024},
-	{0x440, "STM32F05x",   0x08000000, 0x10000, 1024},
-	{0x444, "STM32F03x",   0x08000000, 0x08000, 1024},
-	{0x448, "STM32F07xB",  0x08000000, 0x20000, 1024},
+	{0x416, "STM32L15xxB",   0x08000000, 0x20000, 256},
+	{0x429, "STM32L15xxB-A", 0x08000000, 0x20000, 256},
+	{0x427, "STM32L15xxC",   0x08000000, 0x40000, 256},
+	{0x420, "STM32F100xx",   0x08000000, 0x20000, 1024},
+	{0x410, "STM32F102R8",   0x08000000, 0x10000, 1024},
+	{0x440, "STM32F05x",     0x08000000, 0x10000, 1024},
+	{0x444, "STM32F03x",     0x08000000, 0x08000, 1024},
+	{0x448, "STM32F07xB",    0x08000000, 0x20000, 1024},
 	{ 0 }
 };