diff options
| author | Ting Shen <phoenixshen@google.com> | 2021-09-14 17:56:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-23 09:22:10 +0000 |
| commit | 9c9ee9b28cda9f9bae751336e06e03accbec8f7f (patch) | |
| tree | 19a66d8eab86fe0156842521d2db65ef6697ea8b | |
| parent | f5dc7104a1d034b1ea776691e34aaee1e90775b2 (diff) | |
| download | chrome-ec-9c9ee9b28cda9f9bae751336e06e03accbec8f7f.tar.gz | |
tomato: board rev2 gpio update
GPA4/GPA5: kb backlight -> Programming I2C
GPA3: Test point -> KB_BL_PWM
GPA6: Test point -> EN_KB_BL
Since the PWM pin changed, this CL breaks kb backlight on old boards.
BUG=b:199829459
TEST=pass factory test
BRANCH=main
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I33c42708b7694aeb625ea5b0879b3ac08ec81f67
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3160457
Reviewed-by: Eric Yilun Lin <yllin@google.com>
Tested-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | baseboard/cherry/baseboard.c | 2 | ||||
| -rw-r--r-- | board/cherry/gpio.inc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c index 8123ceaa9c..daf5e218d2 100644 --- a/baseboard/cherry/baseboard.c +++ b/baseboard/cherry/baseboard.c @@ -216,7 +216,7 @@ const struct pwm_t pwm_channels[] = { .pcfsr_sel = PWM_PRESCALER_C4, }, [PWM_CH_KBLIGHT] = { - .channel = 4, + .channel = 3, .flags = 0, .freq_hz = 10000, /* SYV226 supports 10~100kHz */ .pcfsr_sel = PWM_PRESCALER_C6, diff --git a/board/cherry/gpio.inc b/board/cherry/gpio.inc index f3bf7d8364..bf3a3a3210 100644 --- a/board/cherry/gpio.inc +++ b/board/cherry/gpio.inc @@ -86,7 +86,7 @@ GPIO(USB_C1_DP_IN_HPD, PIN(J, 1), GPIO_OUT_LOW) GPIO(USB_C0_FRS_EN, PIN(F, 0), GPIO_OUT_LOW) /* Misc Signals */ -GPIO(EN_KB_BL, PIN(A, 5), GPIO_OUT_LOW) +GPIO(EN_KB_BL, PIN(A, 6), GPIO_OUT_LOW) GPIO(EC_BATT_PRES_ODL, PIN(C, 0), GPIO_INPUT) GPIO(EN_EC_ID_ODL, PIN(H, 5), GPIO_ODR_LOW) GPIO(ENTERING_RW, PIN(C, 5), GPIO_OUT_LOW) /* EC_ENTERING_RW */ @@ -102,8 +102,10 @@ GPIO(I2C_C_SCL, PIN(F, 6), GPIO_INPUT) /* I2C_USB_C0_SCL */ GPIO(I2C_C_SDA, PIN(F, 7), GPIO_INPUT) /* I2C_USB_C0_SDA */ GPIO(I2C_E_SCL, PIN(E, 0), GPIO_INPUT) /* I2C_USB_C1_SCL */ GPIO(I2C_E_SDA, PIN(E, 7), GPIO_INPUT) /* I2C_USB_C1_SDA */ -GPIO(I2C_H_SCL, PIN(H, 1), GPIO_INPUT) /* I2C_PROG_SCL */ -GPIO(I2C_H_SDA, PIN(H, 2), GPIO_INPUT) /* I2C_PROG_SDA */ +GPIO(I2C_F_SCL, PIN(A, 4), GPIO_INPUT) /* Rev 2+ I2C_PROG_SCL */ +GPIO(I2C_F_SDA, PIN(A, 5), GPIO_INPUT) /* Rev 2+ I2C_PROG_SDA */ +GPIO(I2C_H_SCL, PIN(H, 1), GPIO_INPUT) /* Rev 0,1 I2C_PROG_SCL */ +GPIO(I2C_H_SDA, PIN(H, 2), GPIO_INPUT) /* Rev 0,1 I2C_PROG_SDA */ /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(B, 0x18), 1, MODULE_I2C, 0) /* I2C A */ @@ -115,7 +117,7 @@ ALTERNATE(PIN_MASK(E, 0x81), 1, MODULE_I2C, 0) /* I2C E */ ALTERNATE(PIN_MASK(B, 0x03), 1, MODULE_UART, 0) /* EC to Servo */ /* PWM */ -ALTERNATE(PIN_MASK(A, 0b10111), 1, MODULE_PWM, 0) /* PWM 0,1,2,4 */ +ALTERNATE(PIN_MASK(A, 0b1111), 1, MODULE_PWM, 0) /* PWM 0,1,2,3 */ /* ADC */ ALTERNATE(PIN_MASK(I, 0xCF), 0, MODULE_ADC, 0) /* ADC 0,1,2,3,6,7 */ @@ -149,8 +151,6 @@ GPIO(SPI_MISO_GPG5, PIN(G, 5), GPIO_OUT_LOW) GPIO(SPI_CS_GPG7, PIN(G, 7), GPIO_OUT_LOW) /* Other unused pins */ -GPIO(PWM3, PIN(A, 3), GPIO_INPUT) -GPIO(PWM6, PIN(A, 6), GPIO_INPUT) GPIO(PWM7, PIN(A, 7), GPIO_INPUT) GPIO(EC_NVME_PLN_ODL, PIN(D, 7), GPIO_INPUT) GPIO(NVME_EC_PLA_S3_ODL, PIN(I, 7), GPIO_INPUT) |