From 02995b2d6fd089b74b773b47fd10c4bff779ce4b Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 14 Nov 2013 16:40:12 -0600 Subject: rambi: use gpio for SCI# assertion For some reason the SCI# is not working properly when the LPC module controls the pad. Instead, utilize CONFIG_SCI_GPIO option and put that GPIO pad into open-drain mode. BUG=chrome-os-partner:24003 BRANCH=None TEST=Built and booted rambi with dependency change. 'lidclose' and 'lidopen' cause ACPI interrupts. Change-Id: I5df455bc2fc9af4c43517a93c5a35dc598fd54e9 Reviewed-on: https://chromium-review.googlesource.com/176805 Tested-by: Aaron Durbin Reviewed-by: Shawn Nematbakhsh Reviewed-by: Randall Spangler Commit-Queue: Aaron Durbin --- board/rambi/board.c | 2 +- board/rambi/board.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/rambi/board.c b/board/rambi/board.c index b1856b0d3a..1dc0ced203 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -109,6 +109,7 @@ const struct gpio_info gpio_list[] = { {"USB2_ENABLE", LM4_GPIO_D, (1<<5), GPIO_OUT_LOW, NULL}, {"VCORE_EN", LM4_GPIO_C, (1<<5), GPIO_OUT_LOW, NULL}, {"WLAN_OFF_L", LM4_GPIO_J, (1<<4), GPIO_OUT_LOW, NULL}, + {"PCH_SCI_L", LM4_GPIO_M, (1<<1), GPIO_ODR_HIGH, NULL}, }; BUILD_ASSERT(ARRAY_SIZE(gpio_list) == GPIO_COUNT); @@ -122,7 +123,6 @@ const struct gpio_alt_func gpio_alt_funcs[] = { {GPIO_D, 0x0f, 2, MODULE_SPI}, /* SPI1 */ {GPIO_L, 0x3f, 15, MODULE_LPC}, /* LPC */ {GPIO_M, 0x31, 15, MODULE_LPC}, /* LPC */ - {GPIO_M, 0x02, 15, MODULE_LPC, GPIO_OPEN_DRAIN},/* LPC (SCI#) */ {GPIO_N, 0x50, 1, MODULE_PWM_LED, GPIO_OPEN_DRAIN}, /* FAN0PWM 3&4 */ }; const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs); diff --git a/board/rambi/board.h b/board/rambi/board.h index 34ed193823..7d283c80f1 100644 --- a/board/rambi/board.h +++ b/board/rambi/board.h @@ -29,6 +29,7 @@ #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 #define CONFIG_PWM +#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L #define CONFIG_TEMP_SENSOR #define CONFIG_TEMP_SENSOR_G781 #define CONFIG_TEMP_SENSOR_POWER_GPIO GPIO_PP3300_DX_EN @@ -114,6 +115,7 @@ enum gpio_signal { GPIO_USB2_ENABLE, /* USB port 2 output power enable */ GPIO_VCORE_EN, /* Enable core power supplies */ GPIO_WLAN_OFF_L, /* Disable WiFi radio */ + GPIO_PCH_SCI_L, /* Assert SCI to PCH */ /* Number of GPIOs; not an actual GPIO */ GPIO_COUNT -- cgit v1.2.1