From 5e6fb5cdded2f3449657427b88cb2eaa4eba90a3 Mon Sep 17 00:00:00 2001 From: Caveh Jalali Date: Wed, 6 Jun 2018 21:42:52 -0700 Subject: atlas: configure GPIOC2 as PWM1 on the npcx7, GPIOC2 is a bit special because it has 2 alternate modes. we want the PWM1 mode instead of I2C6, and that's selected using a special #define. BUG=b:94613023,b:78309559 BRANCH=none TEST=apshutdown still works Change-Id: Ibd8baa15640344ce6c48b2c849e0d9fe6ce4239f Signed-off-by: Caveh Jalali Reviewed-on: https://chromium-review.googlesource.com/1090320 Commit-Ready: caveh jalali Tested-by: caveh jalali Reviewed-by: Aseda Aboagye --- board/atlas/board.h | 2 +- board/atlas/gpio.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/atlas/board.h b/board/atlas/board.h index b800e99909..8e3fc99440 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -148,7 +148,7 @@ #define NPCX_UART_MODULE2 1 /* 1:GPIO64/65 as UART */ #define NPCX_JTAG_MODULE2 0 /* 0:GPIO21/17/16/20 as JTAG */ #define NPCX_TACH_SEL2 0 /* 0:GPIO40/73 1:GPIO93/A6 as TACH */ -#define NPCX7_PWM1_SEL 0 /* GPIO C2 is not used as PWM1. */ +#define NPCX7_PWM1_SEL 1 /* GPIO C2 is used as PWM1. */ /* I2C ports */ #define I2C_PORT_POWER NPCX_I2C_PORT0_0 /* pmic/charger */ diff --git a/board/atlas/gpio.inc b/board/atlas/gpio.inc index 215872571e..cbb340ead9 100644 --- a/board/atlas/gpio.inc +++ b/board/atlas/gpio.inc @@ -121,7 +121,7 @@ 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(B, 0x80), 0, MODULE_PWM, 0) /* GPIOB7 PWM5 CHARGE_LED6 */ -ALTERNATE(PIN_MASK(C, 0x08), 0, MODULE_PWM, 0) /* GPIOC3 PWM0 CHARGE_LED1 */ +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 */ -- cgit v1.2.1