stm32: drive the keyboard power LED

Put the power LED in the right state (off, on, breathing) depending on
the AP state (off, running, suspending).

The power LED is connected to GPIO B3.
The AP suspend detection is done through GPIO A7.
(so we no longer configure it as SPI alternate function)

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=chrome-os-partner:10647
TEST=on Lucas DVT, boot/stop the board and see the LED on and off.

Change-Id: I42121aacab35e9da7a751dc9f56bcc5af7850783
Reviewed-on: https://gerrit.chromium.org/gerrit/25880
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>

6 files changed, 17 insertions, 4 deletions

diff --git a/board/daisy/board.c b/board/daisy/board.c
index fa15b04ebe..8f20fdb18f 100644
--- a/board/daisy/board.c
+++ b/board/daisy/board.c
@@ -33,8 +33,10 @@
 /* GPIO interrupt handlers prototypes */
 #ifndef CONFIG_TASK_GAIAPOWER
 #define gaia_power_event NULL
+#define gaia_suspend_event NULL
 #else
 void gaia_power_event(enum gpio_signal signal);
+void gaia_suspend_event(enum gpio_signal signal);
 #endif
 #ifndef CONFIG_TASK_KEYSCAN
 #define matrix_interrupt NULL
@@ -48,6 +50,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
 	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_RISING, gaia_power_event},
 	{"CHARGER_INT", GPIO_C, (1<<4),  GPIO_INT_RISING, NULL},
 	{"LID_OPEN",    GPIO_C, (1<<13), GPIO_INT_BOTH, NULL},
+	{"SUSPEND_L",   GPIO_A, (1<<7),  GPIO_INT_BOTH, gaia_suspend_event},
 	{"KB_IN00",     GPIO_C, (1<<8),  GPIO_KB_INPUT, matrix_interrupt},
 	{"KB_IN01",     GPIO_C, (1<<9),  GPIO_KB_INPUT, matrix_interrupt},
 	{"KB_IN02",     GPIO_C, (1<<10), GPIO_KB_INPUT, matrix_interrupt},
@@ -66,6 +69,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
 	{"PMIC_PWRON_L", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL},
 	{"ENTERING_RW", GPIO_H, (1<<0),  GPIO_OUT_LOW, NULL},
 	{"CHARGER_EN",  GPIO_B, (1<<2),  GPIO_OUT_LOW, NULL},
+	{"POWER_LED_L", GPIO_B, (1<<3),  GPIO_OUT_HIGH, NULL},
 	{"EC_INT",      GPIO_B, (1<<9),  GPIO_HI_Z, NULL},
 	{"CODEC_INT",   GPIO_H, (1<<1),  GPIO_HI_Z, NULL},
 	{"KB_OUT00",    GPIO_B, (1<<0),  GPIO_KB_OUTPUT, NULL},
diff --git a/board/daisy/board.h b/board/daisy/board.h
index 542a2fa967..fe0a708620 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -48,6 +48,7 @@ enum gpio_signal {
 	GPIO_SOC1V8_XPSHOLD,   /* App Processor ON  */
 	GPIO_CHARGER_INT,
 	GPIO_LID_OPEN,         /* LID switch detection */
+	GPIO_SUSPEND_L,        /* AP suspend/resume state */
 	/* Keyboard inputs */
 	GPIO_KB_IN00,
 	GPIO_KB_IN01,
@@ -66,6 +67,7 @@ enum gpio_signal {
 	GPIO_PMIC_PWRON_L,	/* 5v rail ready */
 	GPIO_EC_ENTERING_RW,   /* EC is R/W mode for the kbc mux */
 	GPIO_CHARGER_EN,
+	GPIO_POWER_LED_L,      /* Power state keyboard LED */
 	GPIO_EC_INT,
 	GPIO_CODEC_INT,        /* To audio codec (KB noise cancellation) */
 	GPIO_KB_OUT00,
diff --git a/board/daisy/ec.tasklist b/board/daisy/ec.tasklist
index 6656552c33..91e4d353c0 100644
--- a/board/daisy/ec.tasklist
+++ b/board/daisy/ec.tasklist
@@ -15,6 +15,7 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(WATCHDOG, watchdog_task, NULL) \
+	TASK(POWERLED, power_led_task, NULL) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL) \
 	TASK(GAIAPOWER, gaia_power_task, NULL) \
diff --git a/board/snow/board.c b/board/snow/board.c
index eb02ce5878..1825870ec3 100644
--- a/board/snow/board.c
+++ b/board/snow/board.c
@@ -19,8 +19,10 @@
 /* GPIO interrupt handlers prototypes */
 #ifndef CONFIG_TASK_GAIAPOWER
 #define gaia_power_event NULL
+#define gaia_suspend_event NULL
 #else
 void gaia_power_event(enum gpio_signal signal);
+void gaia_suspend_event(enum gpio_signal signal);
 #endif
 #ifndef CONFIG_TASK_KEYSCAN
 #define matrix_interrupt NULL
@@ -34,6 +36,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
 	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_RISING, gaia_power_event},
 	{"CHARGER_INT", GPIO_C, (1<<4),  GPIO_INT_RISING, NULL},
 	{"LID_OPEN",    GPIO_C, (1<<13), GPIO_INT_BOTH, NULL},
+	{"SUSPEND_L",   GPIO_A, (1<<7),  GPIO_INT_BOTH, gaia_suspend_event},
 	{"KB_IN00",     GPIO_C, (1<<8),  GPIO_KB_INPUT, matrix_interrupt},
 	{"KB_IN01",     GPIO_C, (1<<9),  GPIO_KB_INPUT, matrix_interrupt},
 	{"KB_IN02",     GPIO_C, (1<<10), GPIO_KB_INPUT, matrix_interrupt},
@@ -52,6 +55,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
 	{"PMIC_PWRON_L",GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL},
 	{"ENTERING_RW", GPIO_D, (1<<0),  GPIO_OUT_LOW, NULL},
 	{"CHARGER_EN",  GPIO_B, (1<<2),  GPIO_OUT_LOW, NULL},
+	{"POWER_LED_L", GPIO_B, (1<<3),  GPIO_OUT_HIGH, NULL},
 	{"EC_INT",      GPIO_B, (1<<9),  GPIO_HI_Z, NULL},
 	{"CODEC_INT",   GPIO_D, (1<<1),  GPIO_HI_Z, NULL},
 	{"KB_OUT00",    GPIO_B, (1<<0),  GPIO_KB_OUTPUT, NULL},
@@ -121,10 +125,9 @@ void configure_board(void)
 	/* remap OSC_IN/OSC_OUT to PD0/PD1 */
 	STM32_GPIO_AFIO_MAPR |= 1 << 15;
 
-	/* SPI1 on pins PA4-7 (alt. function push-pull, 10MHz) */
-	val = STM32_GPIO_CRL_OFF(GPIO_A) & ~0xffff0000;
-	val |= 0x99990000;
-	STM32_GPIO_CRL_OFF(GPIO_A) = val;
+	/* use PB3 as a GPIO, so disable JTAG and keep only SWD */
+	STM32_GPIO_AFIO_MAPR = (STM32_GPIO_AFIO_MAPR & ~(0x7 << 24))
+			       | (2 << 24);
 
 	/*
 	 * I2C SCL/SDA on PB10-11 and PB6-7, bi-directional, no pull-up/down,
diff --git a/board/snow/board.h b/board/snow/board.h
index 95efc8074e..dfefbcc55d 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -55,6 +55,7 @@ enum gpio_signal {
 	GPIO_SOC1V8_XPSHOLD,   /* App Processor ON  */
 	GPIO_CHARGER_INT,
 	GPIO_LID_OPEN,         /* LID switch detection */
+	GPIO_SUSPEND_L,        /* AP suspend/resume state */
 	/* Keyboard inputs */
 	GPIO_KB_IN00,
 	GPIO_KB_IN01,
@@ -73,6 +74,7 @@ enum gpio_signal {
 	GPIO_PMIC_PWRON_L,     /* 5v rail ready */
 	GPIO_EC_ENTERING_RW,   /* EC is R/W mode for the kbc mux */
 	GPIO_CHARGER_EN,
+	GPIO_POWER_LED_L,      /* Power state keyboard LED */
 	GPIO_EC_INT,
 	GPIO_CODEC_INT,        /* To audio codec (KB noise cancellation) */
 	GPIO_KB_OUT00,
diff --git a/board/snow/ec.tasklist b/board/snow/ec.tasklist
index 24b151ba87..1e384c0890 100644
--- a/board/snow/ec.tasklist
+++ b/board/snow/ec.tasklist
@@ -15,6 +15,7 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(WATCHDOG, watchdog_task, NULL) \
+	TASK(POWERLED, power_led_task, NULL) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL) \
 	TASK(GAIAPOWER, gaia_power_task, NULL) \
 	TASK(CONSOLE, console_task, NULL) \