diff options
author | Caveh Jalali <caveh@chromium.org> | 2018-05-05 00:39:56 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-06-01 17:44:42 -0700 |
commit | 37987e1e7d50f02ce1f664be1ba66fb40d2fe772 (patch) | |
tree | d9e4f746842ac259159fd3ba8efe51afb8e4aced /board/atlas/gpio.inc | |
parent | 32255f2989a2087479c0a0f440290ce1efc3e4f4 (diff) | |
download | chrome-ec-37987e1e7d50f02ce1f664be1ba66fb40d2fe772.tar.gz |
atlas: board version 1 support
these changes reflect the hardware changes made between version 0 and
version 1 of the atlas board.
note: these changes are not backward compatible - version 0 of atlas
is no longer supported.
BUG=b:78309559
BRANCH=none
TEST=works fine on atlas version 1
Change-Id: Ia519f161c66066e02e9ddce7560a8fe2b7e74882
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1045730
Commit-Ready: Caveh Jalali <caveh@google.com>
Tested-by: Caveh Jalali <caveh@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/atlas/gpio.inc')
-rw-r--r-- | board/atlas/gpio.inc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/board/atlas/gpio.inc b/board/atlas/gpio.inc index ac0627222e..817692873b 100644 --- a/board/atlas/gpio.inc +++ b/board/atlas/gpio.inc @@ -26,19 +26,19 @@ GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) GPIO_INT(ACCELGYRO3_INT_L, PIN(4, 1), GPIO_INT_FALLING, bmi160_interrupt) /* SoC section */ -GPIO(RSMRST_L, PIN(C, 2), GPIO_OUT_LOW) /* SOC Resume Reset */ +GPIO(RSMRST_L, PIN(3, 7), GPIO_OUT_LOW) /* SOC Resume Reset */ GPIO(EC_PCH_PWR_BTN_ODL, PIN(C, 1), GPIO_ODR_HIGH) /* Power button to SOC */ GPIO(EC_PCH_RTCRST, PIN(7, 6), GPIO_OUT_LOW) /* RTC Reset (broken) */ GPIO(EC_PCH_WAKE_L, PIN(7, 4), GPIO_ODR_HIGH) /* PCH wake */ GPIO(EC_PROCHOT_ODL, PIN(3, 4), GPIO_INPUT) /* SOC PROCHOT# */ GPIO(SYS_RESET_L, PIN(0, 2), GPIO_ODR_HIGH) /* SOC reset */ -GPIO(USB_C0_DP_HPD, PIN(C, 5), GPIO_OUT_LOW) /* C0 Hotplug */ -GPIO(USB_C1_DP_HPD, PIN(C, 6), GPIO_OUT_LOW) /* C1 Hotplug */ +GPIO(USB_C0_DP_HPD, PIN(C, 5), GPIO_INPUT) /* C0 Hotplug Detect */ +GPIO(USB_C1_DP_HPD, PIN(C, 6), GPIO_INPUT) /* C1 Hotplug Detect */ /* power seq section */ GPIO(EC_PCH_ACPRESENT, PIN(7, 3), GPIO_ODR_LOW) /* ACOK to SOC */ /* note: SLP_SUS_L_PMIC is an input in the schematics */ -GPIO(SLP_SUS_L_PMIC, PIN(B, 7), GPIO_OUT_LOW) /* SOC SLP_SUS# */ +GPIO(SLP_SUS_L_PMIC, PIN(E, 4), GPIO_OUT_LOW) /* SOC SLP_SUS# */ GPIO(SLP_S4_L, PIN(A, 3), GPIO_INPUT) /* SOC SLP_S4# */ GPIO(SLP_S3_L, PIN(A, 6), GPIO_INPUT) /* SOC SLP_S3# */ GPIO(ROP_INT_L, PIN(D, 5), GPIO_INPUT | GPIO_PULL_UP) /* PMIC IRQ (Unused) */ @@ -50,6 +50,10 @@ GPIO(EN_USB_C0_3A, PIN(6, 2), GPIO_OUT_LOW) /* 1.5/3.0 C0 current limit selec GPIO(EN_USB_C1_5V_OUT, PIN(7, 0), GPIO_OUT_LOW) /* C1 5V Enable */ GPIO(EN_USB_C1_CHARGE_L, PIN(0, 4), GPIO_OUT_LOW) /* alt fn */ GPIO(EN_USB_C1_3A, PIN(8, 3), GPIO_OUT_LOW) /* alt fn 1.5/3.0 C1 current limit selection */ + +GPIO(USB2_VBUSSENSE, PIN(A, 2), GPIO_OUT_LOW) /* USB OTG ID */ +GPIO(USB2_ID, PIN(A, 0), GPIO_OUT_LOW) /* USB OTG VBUS Sense */ + GPIO(USB_PD_RST_L, PIN(F, 1), GPIO_OUT_LOW) /* C0,C1 PD Reset */ /* misc section */ @@ -81,7 +85,6 @@ GPIO(EC_I2C4_BATTERY_SDA, PIN(F, 2), GPIO_INPUT) /* alt fn I2C4_SDA */ /* Not connected */ GPIO(NC_GPIO32, PIN(3, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO35, PIN(3, 5), GPIO_INPUT | GPIO_PULL_UP) -GPIO(NC_GPIO37, PIN(3, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO40, PIN(4, 0), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO44, PIN(4, 4), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO45, PIN(4, 5), GPIO_INPUT | GPIO_PULL_UP) @@ -93,8 +96,6 @@ GPIO(NC_GPIO63, PIN(6, 3), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO66, PIN(6, 6), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO82, PIN(8, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIO95, PIN(9, 5), GPIO_INPUT | GPIO_PULL_UP) -GPIO(NC_GPIOA0, PIN(A, 0), GPIO_INPUT | GPIO_PULL_UP) -GPIO(NC_GPIOA2, PIN(A, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOB1, PIN(B, 1), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOB2, PIN(B, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOB3, PIN(B, 3), GPIO_INPUT | GPIO_PULL_UP) @@ -103,7 +104,6 @@ GPIO(NC_GPIOC7, PIN(C, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOD6, PIN(D, 6), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOD7, PIN(D, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOE0, PIN(E, 0), GPIO_INPUT | GPIO_PULL_UP) -GPIO(NC_GPIOE4, PIN(E, 4), GPIO_INPUT | GPIO_PULL_UP) /* WoV is unused */ GPIO(NC_GPIO94, PIN(9, 4), GPIO_INPUT | GPIO_PULL_UP) @@ -120,7 +120,8 @@ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_GPIO, 0) /* GPIOD2 */ /* PWM channels */ ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* GPIO80 PWM3 KBD_BL_PWM */ -ALTERNATE(PIN_MASK(C, 0x08), 0, MODULE_PWM, 0) /* GPIOC3 PWM0 CHARGE_LED1 */ +ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* GPIOB7 PWM5 CHARGE_LED6 */ +ALTERNATE(PIN_MASK(C, 0x0c), 0, MODULE_PWM, 0) /* GPIOC3,2 PWM0,1 CHARGE_LED1,4 */ ALTERNATE(PIN_MASK(C, 0x10), 0, MODULE_PWM, 0) /* GPIOC4 PWM2 CHARGE_LED2 */ /* I2C alternate functions */ |