summaryrefslogtreecommitdiff
path: root/board/peppy
diff options
context:
space:
mode:
Diffstat (limited to 'board/peppy')
-rw-r--r--board/peppy/board.c9
-rw-r--r--board/peppy/board.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/board/peppy/board.c b/board/peppy/board.c
index 25e3a7663f..89f3e890df 100644
--- a/board/peppy/board.c
+++ b/board/peppy/board.c
@@ -15,6 +15,7 @@
#include "gpio.h"
#include "host_command.h"
#include "i2c.h"
+#include "jtag.h"
#include "keyboard_scan.h"
#include "lid_switch.h"
#include "lm4_adc.h"
@@ -25,6 +26,7 @@
#include "temp_sensor.h"
#include "temp_sensor_g781.h"
#include "timer.h"
+#include "uart.h"
#include "util.h"
/* GPIO signal list. Must match order from enum gpio_signal. */
@@ -60,6 +62,11 @@ const struct gpio_info gpio_list[] = {
switch_interrupt},
{"WP_L", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
switch_interrupt},
+ {"JTAG_TCK", LM4_GPIO_C, (1<<0), GPIO_DEFAULT,
+ jtag_interrupt},
+ {"UART0_RX", LM4_GPIO_A, (1<<0), GPIO_PULL_UP|
+ GPIO_INT_BOTH_DSLEEP,
+ uart_deepsleep_interrupt},
/* Other inputs */
{"FAN_ALERT_L", LM4_GPIO_B, (1<<0), GPIO_INPUT, NULL},
@@ -126,7 +133,7 @@ BUILD_ASSERT(ARRAY_SIZE(gpio_list) == GPIO_COUNT);
/* Pins with alternate functions */
const struct gpio_alt_func gpio_alt_funcs[] = {
- {GPIO_A, 0x03, 1, MODULE_UART}, /* UART0 */
+ {GPIO_A, 0x03, 1, MODULE_UART, GPIO_PULL_UP}, /* UART0 */
{GPIO_B, 0x04, 3, MODULE_I2C}, /* I2C0 SCL */
{GPIO_B, 0x08, 3, MODULE_I2C, GPIO_OPEN_DRAIN}, /* I2C0 SDA */
{GPIO_B, 0x40, 3, MODULE_I2C}, /* I2C5 SCL */
diff --git a/board/peppy/board.h b/board/peppy/board.h
index 5c3a922fb0..93cd667f7a 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -82,6 +82,8 @@ enum gpio_signal {
GPIO_PCH_EDP_VDD_EN, /* PCH wants EDP enabled */
GPIO_RECOVERY_L, /* Recovery signal from servo */
GPIO_WP_L, /* Write protect input */
+ GPIO_JTAG_TCK, /* JTAG clock input */
+ GPIO_UART0_RX, /* UART0 RX input */
/* Other inputs */
GPIO_FAN_ALERT_L, /* From thermal sensor */