diff options
| author | Andrew McRae <amcrae@google.com> | 2020-04-16 16:47:45 +1000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-17 01:49:27 +0000 |
| commit | 9be9876341fff089adb4ee3645c02f8d612ac4c4 (patch) | |
| tree | 717a18e8ddb0c4fc7d1680297b20f7cb40626968 /board/puff/gpio.inc | |
| parent | d8993c5407e32334cac95d056b0036f399e20b4b (diff) | |
| download | chrome-ec-9be9876341fff089adb4ee3645c02f8d612ac4c4.tar.gz | |
Puff: Fix timer/GPIO assignments for fan tacho and HDMI CEC.
BUG=b:152267803
BRANCH=none
TEST=Check fan tacho.
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I993da17dd51dee7b3ffb174635346f6b9b1a51b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2152031
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Tested-by: Andrew McRae <amcrae@chromium.org>
Commit-Queue: Andrew McRae <amcrae@chromium.org>
Diffstat (limited to 'board/puff/gpio.inc')
| -rw-r--r-- | board/puff/gpio.inc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/board/puff/gpio.inc b/board/puff/gpio.inc index daf302d8d7..e4f72a4ce1 100644 --- a/board/puff/gpio.inc +++ b/board/puff/gpio.inc @@ -88,10 +88,10 @@ GPIO(PACKET_MODE_EN, PIN(7, 5), GPIO_OUT_LOW) /* HDMI/CEC */ GPIO(EN_PP5000_HDMI, PIN(5, 0), GPIO_OUT_LOW) -GPIO(HDMI_CONN0_CEC_OUT, PIN(C, 2), GPIO_ODR_HIGH) -GPIO(HDMI_CONN0_CEC_IN, PIN(B, 1), GPIO_INPUT) -GPIO(HDMI_CONN1_CEC_OUT, PIN(6, 0), GPIO_ODR_HIGH) -GPIO(HDMI_CONN1_CEC_IN, PIN(9, 5), GPIO_INPUT) +GPIO(HDMI_CONN0_CEC_OUT, PIN(B, 1), GPIO_ODR_HIGH) +GPIO(HDMI_CONN0_CEC_IN, PIN(4, 0), GPIO_INPUT) +GPIO(HDMI_CONN1_CEC_OUT, PIN(9, 5), GPIO_ODR_HIGH) +GPIO(HDMI_CONN1_CEC_IN, PIN(D, 3), GPIO_INPUT) /* I2C pins - Alternate function below configures I2C module on these pins */ GPIO(I2C0_SCL, PIN(B, 5), GPIO_INPUT) /* EC_I2C_INA_SCL */ @@ -117,7 +117,7 @@ ALTERNATE(PIN_MASK(B, 0x0C), 0, MODULE_I2C, 0) /* I2C7 */ ALTERNATE(PIN_MASK(C, 0x08), 0, MODULE_PWM, 0) /* PWM0 - Red Led */ ALTERNATE(PIN_MASK(C, 0x10), 0, MODULE_PWM, 0) /* PWM2 - Green Led */ ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PWM5 - Fan 1 */ -ALTERNATE(PIN_MASK(4, 0x01), 0, MODULE_PWM, 0) /* TA1 - Fan Tachometer */ +ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0) /* TA2 - Fan Tachometer */ /* ADC */ ALTERNATE(PIN_MASK(4, 0x3E), 0, MODULE_ADC, 0) /* ADC0-4 */ @@ -132,9 +132,9 @@ UNUSED(PIN(1, 3)) /* EC_GP_SEL1_ODL */ UNUSED(PIN(F, 2)) /* EC_I2C_RFU_SDA */ UNUSED(PIN(F, 3)) /* EC_I2C_RFU_SCL */ UNUSED(PIN(C, 0)) /* FAN_PWM_2 */ -UNUSED(PIN(7, 3)) /* FAN_SPEED_TACH_2 */ UNUSED(PIN(8, 0)) /* LED_BLUE_L */ UNUSED(PIN(4, 2)) /* TEMP_SENSOR_3 */ +UNUSED(PIN(C, 2)) /* A12 NC */ UNUSED(PIN(9, 2)) /* K8 NC */ UNUSED(PIN(9, 1)) /* L8 NC */ UNUSED(PIN(1, 2)) /* C6 NC */ @@ -151,7 +151,6 @@ UNUSED(PIN(D, 6)) /* F6 NC */ UNUSED(PIN(3, 5)) /* F5 NC */ UNUSED(PIN(5, 6)) /* M2 NC */ UNUSED(PIN(D, 2)) /* C11 NC */ -UNUSED(PIN(D, 3)) /* E9 NC */ UNUSED(PIN(8, 6)) /* J8 NC */ UNUSED(PIN(9, 3)) /* M11 NC */ UNUSED(PIN(7, 2)) /* H6 NC */ |