diff options
| author | Alec Berg <alecaberg@chromium.org> | 2015-07-08 17:44:50 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-10 20:29:07 +0000 |
| commit | a326ea232c381364700726b2248b8f0ae8c29893 (patch) | |
| tree | 264a2125ee275594a70d604d118d40cb6d27bdd8 | |
| parent | 8c1d76e52cd360557a08e64c3300bb0e29f6637b (diff) | |
| download | chrome-ec-a326ea232c381364700726b2248b8f0ae8c29893.tar.gz | |
glados: scrub gpio config to save power
BUG=chrome-os-partner:42104
BRANCH=none
TEST=load on glados, boot, test keyboard and lid
switch.
Change-Id: I1c308e4372f5eb23549ca2c7101373ef16cb1a62
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/283558
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
| -rw-r--r-- | board/glados/gpio.inc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/board/glados/gpio.inc b/board/glados/gpio.inc index 5b488ab2ae..8cc2e7d1fe 100644 --- a/board/glados/gpio.inc +++ b/board/glados/gpio.inc @@ -5,27 +5,27 @@ * found in the LICENSE file. */ -GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH_DSLEEP, lid_interrupt) +GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, lid_interrupt) GPIO_INT(AC_PRESENT, PIN(30), GPIO_INT_BOTH_DSLEEP, 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 */ GPIO_INT(POWER_BUTTON_L, PIN(35), GPIO_INT_BOTH_DSLEEP, power_button_interrupt) /* RSMRST from PMIC */ GPIO_INT(RSMRST_L_PGOOD, PIN(63), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(PCH_SLP_S4_L, PIN(200), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt) -GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt) +GPIO_INT(PCH_SLP_S4_L, PIN(200), GPIO_INT_BOTH_DSLEEP, power_signal_interrupt) +GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH_DSLEEP, power_signal_interrupt) GPIO_INT(PCH_SLP_S0_L, PIN(211), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) -GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) +GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(VOLUME_UP_L, PIN(31), GPIO_INT_FALLING | GPIO_PULL_UP, button_interrupt) GPIO_INT(VOLUME_DOWN_L, PIN(47), GPIO_INT_FALLING | GPIO_PULL_UP, button_interrupt) GPIO_INT(PMIC_INT_L, PIN(50), GPIO_INT_FALLING, power_signal_interrupt) -GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING | GPIO_INT_DSLEEP, pd_mcu_interrupt) +GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING | GPIO_INT_DSLEEP | GPIO_PULL_UP, pd_mcu_interrupt) GPIO_INT(USB_C0_VBUS_WAKE_L,PIN(152), GPIO_INT_BOTH, vbus0_evt) GPIO_INT(USB_C1_VBUS_WAKE_L,PIN(123), GPIO_INT_BOTH, vbus1_evt) GPIO_INT(USB_C0_BC12_INT_L, PIN(124), GPIO_INT_FALLING, usb0_evt) GPIO_INT(USB_C1_BC12_INT_L, PIN(145), GPIO_INT_FALLING, usb1_evt) /* Delayed PWR_OK from PMIC */ -GPIO_INT(PMIC_DPWROK, PIN(55), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(PMIC_DPWROK, PIN(55), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) GPIO(PD_RST_L, PIN(130), GPIO_ODR_HIGH) GPIO(USB2_OTG_ID, PIN(13), GPIO_ODR_LOW) @@ -52,12 +52,12 @@ GPIO(USB_C0_DP_HPD, PIN(46), GPIO_OUT_LOW) GPIO(USB_C1_DP_HPD, PIN(51), GPIO_OUT_LOW) GPIO(CPU_PROCHOT, PIN(52), GPIO_OUT_LOW) GPIO(ENABLE_TOUCHPAD, PIN(53), GPIO_OUT_LOW) -GPIO(BAT_PRESENT_L, PIN(56), GPIO_INPUT | GPIO_PULL_UP) +GPIO(BAT_PRESENT_L, PIN(56), GPIO_INPUT) GPIO(USB_PD_WAKE, PIN(60), GPIO_OUT_LOW) /* When asserted, ME does not lock security descriptor */ GPIO(PCH_SEC_DISABLE_L, PIN(65), GPIO_OUT_HIGH) GPIO(PCH_WAKE_L, PIN(66), GPIO_ODR_HIGH) -GPIO(EC_FAN1_TTACH, PIN(105), GPIO_INPUT) +GPIO(EC_FAN1_TTACH, PIN(105), GPIO_INPUT | GPIO_PULL_UP) /* Fan PWM output - NC / testing only */ GPIO(EC_FAN1_PWM, PIN(136), GPIO_OUT_LOW) GPIO(PCH_ACOK, PIN(110), GPIO_OUT_LOW) @@ -71,26 +71,25 @@ GPIO(WLAN_OFF_L, PIN(132), GPIO_OUT_LOW) GPIO(PCH_RCIN_L, PIN(135), GPIO_ODR_HIGH) GPIO(USB2_OTG_VBUSSENSE, PIN(140), GPIO_OUT_LOW) /* Sensor input for KB PROX - UNUSED */ -GPIO(KB_PROX_INT_L, PIN(141), GPIO_INPUT) +GPIO(KB_PROX_INT_L, PIN(141), GPIO_INPUT | GPIO_PULL_UP) GPIO(PCH_RSMRST_L, PIN(143), GPIO_OUT_LOW) /* prochot input from devices */ -GPIO(PLATFORM_EC_PROCHOT, PIN(151), GPIO_INPUT) +GPIO(PLATFORM_EC_PROCHOT, PIN(151), GPIO_INPUT | GPIO_PULL_UP) GPIO(USB_C0_5V_EN, PIN(154), GPIO_OUT_LOW) GPIO(USB_C1_5V_EN, PIN(204), GPIO_OUT_LOW) GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW) GPIO(USB_C1_CHARGE_EN_L, PIN(157), GPIO_OUT_LOW) GPIO(PP1800_DX_SENSOR_EN, PIN(11), GPIO_OUT_HIGH) GPIO(PP1800_DX_AUDIO_EN, PIN(160), GPIO_OUT_HIGH) -GPIO(PCH_RTCRST_L, PIN(163), GPIO_ODR_HIGH) +GPIO(PCH_RTCRST, PIN(163), GPIO_OUT_LOW) /* From lid sensor */ -GPIO(TABLET_MODE, PIN(201), GPIO_INPUT) +GPIO(TABLET_MODE, PIN(201), GPIO_INPUT | GPIO_PULL_UP) GPIO(ENABLE_BACKLIGHT, PIN(202), GPIO_OUT_HIGH) GPIO(PP3300_WLAN_EN, PIN(203), GPIO_OUT_HIGH) GPIO(EC_WAKE_CLK, PIN(210), GPIO_INPUT) GPIO(BOARD_ID0, PIN(6), GPIO_INPUT) GPIO(BOARD_ID1, PIN(7), GPIO_INPUT) GPIO(BOARD_ID2, PIN(10), GPIO_INPUT) -GPIO(KBD_KSO2, PIN(101), GPIO_OUT_LOW) GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH) GPIO(SYS_RESET_L, PIN(121), GPIO_ODR_HIGH) |