summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Rodriguez Buchillon <coconutruben@chromium.org>2018-03-16 15:05:27 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-03-17 19:28:01 -0700
commit25039a3ba16615bafcd18c1d913f3c6474d70c7c (patch)
tree346b76bc408eb43d189b9ef21ffa59cb17b2c3d8
parentc776583aeb62eadddbe50846cd4d41f6520be37a (diff)
downloadchrome-ec-25039a3ba16615bafcd18c1d913f3c6474d70c7c.tar.gz
ec: unused gpio reconfigure for lower suspend power
This change brings the improvements to suspend EC power on npcx by properly configuring unused GPIOs to INPUT | PULL_UP. BOARDID pins are all reconfigured for low power since they get properly configured on reading anyways. Those are: GPIO43 (BOARD_VERSION1) GPIO44 (BOARD_VERSION2) GPIO45 (BOARD_VERSION3) GPIO57 (TP_EC_GPIO_57) is unused GPIO01 (CHARGER_RST_ODL) is floating GPIO02 (EC_HAVEN_RESET_ODL) is floating BRANCH=eve BUG=b:69816245 TEST=manual with R67-10492.0.0, and ec: eve_v1.1.6585-859d2ea99 (powerd_dbus_suspend) @@ NAME COUNT AVERAGE STDDEV MAX MIN @@ pp3300_dsw_ec_mw 5053 19.57 6.12 39.14 9.59 with R67-10492.0.0, and ec: eve_v1.1.6620-f8301499 (this change) (powerd_dbus_suspend) @@ NAME COUNT AVERAGE STDDEV MAX MIN @@ pp3300_dsw_ec_mw 5199 12.78 5.43 17.99 3.98 Change-Id: I83879be45c1aa74dc4746ea51db41e068e2284b4 Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/965782 Reviewed-by: Duncan Laurie <dlaurie@google.com>
-rw-r--r--board/eve/gpio.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/board/eve/gpio.inc b/board/eve/gpio.inc
index 7248d7d14d..fe10d3cdee 100644
--- a/board/eve/gpio.inc
+++ b/board/eve/gpio.inc
@@ -43,7 +43,7 @@ GPIO(ENABLE_BACKLIGHT, PIN(5, 6), GPIO_OUT_LOW) /* Enable Backlight */
GPIO(TRACKPAD_SHDN_L, PIN(3, 2), GPIO_OUT_LOW) /* Enable Trackpad */
GPIO(WLAN_OFF_L, PIN(7, 2), GPIO_OUT_LOW) /* Disable WLAN */
GPIO(PP3300_DX_WLAN, PIN(A, 7), GPIO_OUT_LOW) /* Enable WLAN 3.3V Power */
-GPIO(CHARGER_RST_ODL, PIN(0, 1), GPIO_ODR_HIGH) /* CHARGER_RST_ODL */
+GPIO(CHARGER_RST_ODL, PIN(0, 1), GPIO_INPUT | GPIO_PULL_UP) /* CHARGER_RST_ODL, no-connect */
GPIO(CPU_PROCHOT, PIN(8, 1), GPIO_OUT_LOW) /* PROCHOT to SOC */
GPIO(PCH_ACOK, PIN(5, 0), GPIO_ODR_LOW) /* ACOK to SOC */
GPIO(PCH_WAKE_L, PIN(A, 3), GPIO_ODR_HIGH) /* Wake SOC */
@@ -54,7 +54,7 @@ GPIO(SYS_RESET_L, PIN(6, 1), GPIO_ODR_HIGH) /* Cold Reset to SOC */
GPIO(PMIC_SLP_SUS_L, PIN(8, 5), GPIO_OUT_LOW) /* SLP_SUS# to PMIC */
GPIO(BATTERY_PRESENT_L, PIN(3, 4), GPIO_INPUT) /* Battery Present */
GPIO(CCD_MODE_ODL, PIN(6, 3), GPIO_INPUT) /* Case Closed Debug Mode */
-GPIO(EC_HAVEN_RESET_ODL, PIN(0, 2), GPIO_ODR_HIGH) /* H1 Reset */
+GPIO(EC_HAVEN_RESET_ODL, PIN(0, 2), GPIO_INPUT | GPIO_PULL_UP) /* H1 Reset, no-connect */
GPIO(ENTERING_RW, PIN(7, 6), GPIO_OUTPUT) /* EC Entering RW */
GPIO(PMIC_INT_L, PIN(6, 0), GPIO_INPUT) /* PMIC interrupt */
@@ -88,9 +88,9 @@ GPIO(USB2_OTG_ID, PIN(A, 1), GPIO_ODR_LOW) /* OTG ID */
GPIO(USB2_OTG_VBUSSENSE, PIN(9, 5), GPIO_OUT_LOW) /* OTG VBUS Sense */
/* Board ID */
-GPIO(BOARD_VERSION1, PIN(4, 3), GPIO_INPUT) /* Board ID bit0 */
-GPIO(BOARD_VERSION2, PIN(4, 4), GPIO_INPUT) /* Board ID bit1 */
-GPIO(BOARD_VERSION3, PIN(4, 5), GPIO_INPUT) /* Board ID bit2 */
+GPIO(BOARD_VERSION1, PIN(4, 3), GPIO_INPUT | GPIO_PULL_UP) /* Board ID bit0 */
+GPIO(BOARD_VERSION2, PIN(4, 4), GPIO_INPUT | GPIO_PULL_UP) /* Board ID bit1 */
+GPIO(BOARD_VERSION3, PIN(4, 5), GPIO_INPUT | GPIO_PULL_UP) /* Board ID bit2 */
/* Alternate functions GPIO definitions */
ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, 0) /* GPIO64-65 */ /* UART from EC to Servo */
@@ -110,6 +110,9 @@ ALTERNATE(PIN_MASK(C, 0x04), 1, MODULE_PWM, 0) /* GPIOC2 PWM1 Red*/
ALTERNATE(PIN_MASK(C, 0x08), 1, MODULE_PWM, 0) /* GPIOC3 PWM0 Green */
ALTERNATE(PIN_MASK(C, 0x01), 1, MODULE_PWM, 0) /* GPIOC0 PWM6 Blue */
+/* Set unused pins as Input+PU */
+GPIO(TP_EC_GPIO_57, PIN(5, 7), GPIO_INPUT | GPIO_PULL_UP)
+
/* Keyboard pins */
#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP)
#define GPIO_KB_OUTPUT (GPIO_ODR_HIGH)