diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-12-18 17:57:44 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-12-24 01:43:00 -0800 |
| commit | 2c0843e845536b32665c7894a6e544f6fdd4a467 (patch) | |
| tree | 4ec81dcbc8cd471242ffba8a4cf985d81051af9a | |
| parent | 8b3090c1bdbb5515578b655e753574ebd9dfc304 (diff) | |
| download | chrome-ec-2c0843e845536b32665c7894a6e544f6fdd4a467.tar.gz | |
chell / chell_pd: Use power-optimized GPIO defaults
Pull floating pins high, don't duplicate external pull ups, and make a
few other minor changes.
BUG=chrome-os-partner:48109
TEST=Verify chell continues to boot and S5 power is reduced to
~5.5 mW.
BRANCH=None
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: Iaee0cc926149dae1f4189e6b9e4f7e3a4da6ba1c
Reviewed-on: https://chromium-review.googlesource.com/319165
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
| -rw-r--r-- | board/chell/gpio.inc | 34 | ||||
| -rw-r--r-- | board/glados_pd/gpio.inc | 2 |
2 files changed, 22 insertions, 14 deletions
diff --git a/board/chell/gpio.inc b/board/chell/gpio.inc index 74fb4b0414..20cab05eae 100644 --- a/board/chell/gpio.inc +++ b/board/chell/gpio.inc @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH | GPIO_PULL_UP, lid_interrupt) +GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH, lid_interrupt) GPIO_INT(AC_PRESENT, PIN(30), GPIO_INT_BOTH, extpower_interrupt) GPIO_INT(WP_L, PIN(33), GPIO_INT_BOTH, switch_interrupt) /* Buffered power button input from PMIC / ROP_EC_PWR_BTN_L_R */ @@ -54,10 +54,6 @@ GPIO(PCH_RTCRST, PIN(163), GPIO_OUT_LOW) GPIO(SYS_RESET_L, PIN(121), GPIO_ODR_HIGH) GPIO(ENTERING_RW, PIN(41), GPIO_OUT_LOW) -/* Fan PWM output - NC / testing only */ -GPIO(EC_FAN1_TTACH, PIN(105), GPIO_INPUT | GPIO_PULL_UP) -GPIO(EC_FAN1_PWM, PIN(136), GPIO_OUT_LOW) - /* Devices and power */ GPIO(PP1800_DX_DMIC_EN, PIN(11), GPIO_OUT_LOW) GPIO(PP1800_DX_AUDIO_EN, PIN(141), GPIO_OUT_LOW) @@ -99,6 +95,20 @@ GPIO(KEYBOARD_BACKLIGHT, PIN(34), GPIO_OUT_LOW) GPIO(CHARGE_LED_1, PIN(155), GPIO_OUT_LOW) GPIO(CHARGE_LED_2, PIN(156), GPIO_OUT_LOW) +/* This pins are either NC, NC / pulled up, or connected to test points */ +GPIO(I2C2_SENSOR_3V3_SCL, PIN(20), GPIO_INPUT) +GPIO(I2C2_SENSOR_3V3_SDA, PIN(21), GPIO_INPUT) +GPIO(NC_031, PIN(31), GPIO_INPUT | GPIO_PULL_UP) +GPIO(NC_047, PIN(47), GPIO_INPUT | GPIO_PULL_UP) +GPIO(NC_067, PIN(67), GPIO_INPUT | GPIO_PULL_UP) +GPIO(EC_FAN1_TTACH, PIN(105), GPIO_INPUT | GPIO_PULL_UP) +GPIO(EC_FAN1_PWM, PIN(136), GPIO_INPUT | GPIO_PULL_UP) +GPIO(ACCELGYRO3_INT_L, PIN(147), GPIO_INPUT) +GPIO(SHD_CS0_L, PIN(150), GPIO_INPUT) +GPIO(ACCELGYRO4_INT_L, PIN(157), GPIO_INPUT) +GPIO(TABLET_MODE_EC, PIN(160), GPIO_INPUT | GPIO_PULL_UP) +GPIO(ACCEL1_INT_L, PIN(161), GPIO_INPUT) + /* Alternate functions GPIO definitions */ /* GPIO162(UART_RX), GPIO165(UART_TX) */ @@ -134,17 +144,15 @@ ALTERNATE(PIN_MASK(12, 0x01), 1, MODULE_LPC, 0) /* MOSI - GPIO054 */ ALTERNATE(PIN_MASK(5, 0x10), 1, MODULE_SPI, 0) /* MISO - GPIO164 */ -ALTERNATE(PIN_MASK(16, 0x10), 1, MODULE_SPI, 0) +ALTERNATE(PIN_MASK(16, 0x10), 1, MODULE_SPI, GPIO_PULL_UP) /* PVT_SCLK - GPIO153 */ ALTERNATE(PIN_MASK(15, 0x08), 1, MODULE_SPI, 0) -/* SHD_CS0# - GPIO150. Shared SPI chip select */ -ALTERNATE(PIN_MASK(15, 0x00), 1, MODULE_SPI, 0) /* I2C pins */ /* I2C0_0 CLK - GPIO015, I2C0_0 DAT - GPIO016, I2C0_1 DAT - GPIO017 */ ALTERNATE(PIN_MASK(1, 0xe0), 2, MODULE_I2C, GPIO_ODR_HIGH) -/* I2C{1,2,3} CLK / DAT - GPIO020-GPIO025*/ -ALTERNATE(PIN_MASK(2, 0x3f), 2, MODULE_I2C, GPIO_ODR_HIGH) +/* I2C{1,3} CLK / DAT - GPIO022-GPIO025*/ +ALTERNATE(PIN_MASK(2, 0x3c), 2, MODULE_I2C, GPIO_ODR_HIGH) /* I2C0_1 CLK - GPIO134 */ ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_ODR_HIGH) @@ -155,9 +163,9 @@ ALTERNATE(PIN_MASK(5, 0x80), 1, MODULE_ADC, GPIO_ANALOG) ALTERNATE(PIN_MASK(6, 0x06), 1, MODULE_ADC, GPIO_ANALOG) /* LED1 - GPIO155. LED2 - GPIO156 */ -ALTERNATE(PIN_MASK(15, 0x60), 2, MODULE_POWER_LED, 0) +/* ALTERNATE(PIN_MASK(15, 0x60), 2, MODULE_POWER_LED, 0) */ /* VCC1_RST# - GPIO131 */ -ALTERNATE(PIN_MASK(13, 0x02), 1, MODULE_PMU, 0) +ALTERNATE(PIN_MASK(13, 0x02), 1, MODULE_PMU, GPIO_ODR_HIGH) /* nRESET_OUT - GPIO121 */ -ALTERNATE(PIN_MASK(12, 0x02), 1, MODULE_PMU, 0) +ALTERNATE(PIN_MASK(12, 0x02), 1, MODULE_PMU, GPIO_ODR_HIGH) diff --git a/board/glados_pd/gpio.inc b/board/glados_pd/gpio.inc index 689b37d052..4b6db61891 100644 --- a/board/glados_pd/gpio.inc +++ b/board/glados_pd/gpio.inc @@ -45,7 +45,7 @@ GPIO(SLAVE_I2C_SDA, PIN(B, 7), GPIO_INPUT) #ifdef BOARD_OAK_PD GPIO(EC_INT, PIN(B, 5), GPIO_OUT_HIGH) #else -GPIO(EC_INT, PIN(A, 14), GPIO_OUT_HIGH) +GPIO(EC_INT, PIN(A, 14), GPIO_ODR_HIGH) #endif UNIMPLEMENTED(WP_L) |