diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2022-10-18 12:05:07 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-10-28 16:19:24 +0000 |
| commit | 66cf8fb2f5b70efd21243b3bdf2598e9d2afc75b (patch) | |
| tree | accd08c9b784f06cde80cca8e123e5b918e488d2 /board/reef | |
| parent | 61bf6760d456e4998745bebd72e53c9d7c8ec874 (diff) | |
| download | chrome-ec-66cf8fb2f5b70efd21243b3bdf2598e9d2afc75b.tar.gz | |
board/reef: Fix temp sensor gpios
When compiling with clang, it warns:
board/reef/gpio.inc:168:1: error: initializer overrides prior
initialization of this subobject [-Werror,-Winitializer-overrides]
ALTERNATE(PIN(4, 5), 6, MODULE_ADC, 0)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
common/gpio.c:39:53: note: expanded from macro 'ALTERNATE'
{ GPIO_##pinmask, .func = (function), .module_id = (module), \
^~~~~~~~
board/reef/gpio.inc:168:1: note: previous initialization is here
ALTERNATE(PIN(4, 5), 6, MODULE_ADC, 0)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
It looks like the intent was to use the PIN_MASK macro instead of PIN.
Replace with PIN_MASK(4, 0x10) and PIN_MASK(4, 0x30), which simplifies
to PIN_MASK(4, 0x30).
Also change '6' to '0', since this field changes PWM type (e.g.,
PWM_IO_FUNC) but these ports are ADC.
BRANCH=none
BUG=b:35575418, b:172020503
TEST=make buildall
TEST=CC=clang make BOARD=reef
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: Icf13e8cb5eb6bd0ea95ad9b977f11f39c6ac67c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3965726
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/reef')
| -rw-r--r-- | board/reef/gpio.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/reef/gpio.inc b/board/reef/gpio.inc index 5693274284..3f66a9903a 100644 --- a/board/reef/gpio.inc +++ b/board/reef/gpio.inc @@ -164,8 +164,8 @@ ALTERNATE(PIN_MASK(0, 0xe0), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) ALTERNATE(PIN_MASK(1, 0x7f), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) GPIO(KBD_KSO2, PIN(1, 7), GPIO_KB_OUTPUT_COL2) -ALTERNATE(PIN(4, 4), 6, MODULE_ADC, 0) /* TEMP_SENSOR_AMB (FIXME: alt function 6?) */ -ALTERNATE(PIN(4, 5), 6, MODULE_ADC, 0) /* TEMP_SENSOR_CHARGER (FIXME: alt function?) */ +/* GPIO44 for TEMP_SENSOR_AMB and GPIO45 for TEMP_SENSOR_CHARGER */ +ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* GPIO87 for EC_I2C_GYRO_SDA */ ALTERNATE(PIN_MASK(9, 0x01), 1, MODULE_I2C, 0) /* GPIO90 for EC_I2C_GYRO_SCL */ |