summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-10-05 17:03:15 +0000
committerCommit Bot <commit-bot@chromium.org>2021-10-08 01:29:51 +0000
commit93830adaf8a499e58953c992208cff34106f05cb (patch)
treeb9ad08a129e535412c26c79db19627125697a9cf
parent0b21ad072215053b2d1a872d800fe5ad9caadac7 (diff)
downloadchrome-ec-93830adaf8a499e58953c992208cff34106f05cb.tar.gz
tree: Fix TEMP_SENSOR3 GPIO declaration
When building with clang, it reports: board/chronicler/gpio.inc:178:1: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides] ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */ This expands to: static const struct gpio_alt_func gpio_alt_funcs[] = { ... {GPIO_PORT_F, (1U << (1)), .func = (0), .module_id = (MODULE_ADC), .flags = (0)} }; The problem is that struct gpio_alt_func has the order "module_id, func, port, mask, flags", so in this case we are setting func to (1U << (1)) and then to (0). It looks like the intent was to use the PIN_MASK macro instead of PIN, which expands to: static const struct gpio_alt_func gpio_alt_funcs[] = { ... {.port = GPIO_PORT_F, .mask = ((1U << (1))), .func = (0), .module_id = (MODULE_ADC), .flags = (0)}, }; The code appears to be repeated in several boards, which were found with: git grep --name-only TEMP_SENSOR3 | grep gpio.inc | sort | uniq BRANCH=none BUG=b:172020503 TEST=make CC=arm-none-eabi-clang BOARD=chronicler Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: I66a097b761c0b15466a30e53a710d532cd48256c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3206478 Reviewed-by: Eric Yilun Lin <yllin@google.com>
Diffstat
-rw-r--r--board/boldar/gpio.inc2
-rw-r--r--board/chronicler/gpio.inc2
-rw-r--r--board/collis/gpio.inc2
-rw-r--r--board/copano/gpio.inc2
-rw-r--r--board/delbin/gpio.inc2
-rw-r--r--board/drobit/gpio.inc2
-rw-r--r--board/eldrid/gpio.inc2
-rw-r--r--board/elemi/gpio.inc2
-rw-r--r--board/halvor/gpio.inc2
-rw-r--r--board/lindar/gpio.inc2
-rw-r--r--board/lingcod/gpio.inc2
-rw-r--r--board/malefor/gpio.inc2
-rw-r--r--board/terrador/gpio.inc2
-rw-r--r--board/todor/gpio.inc2
-rw-r--r--board/trondo/gpio.inc2
-rw-r--r--board/voema/gpio.inc2
-rw-r--r--board/volet/gpio.inc2
-rw-r--r--board/volteer/gpio.inc2
-rw-r--r--board/voxel/gpio.inc2
19 files changed, 19 insertions, 19 deletions
diff --git a/board/boldar/gpio.inc b/board/boldar/gpio.inc
index f41d198df5..4f55b5c503 100644
--- a/board/boldar/gpio.inc
+++ b/board/boldar/gpio.inc
@@ -179,4 +179,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/chronicler/gpio.inc b/board/chronicler/gpio.inc
index dc00e3eddf..b85322ac6c 100644
--- a/board/chronicler/gpio.inc
+++ b/board/chronicler/gpio.inc
@@ -175,5 +175,5 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/collis/gpio.inc b/board/collis/gpio.inc
index 0bd40b8499..95e0ca8ba2 100644
--- a/board/collis/gpio.inc
+++ b/board/collis/gpio.inc
@@ -168,7 +168,7 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
/* Unused signals */
GPIO(UNUSED_GPIOD4, PIN(D, 4), GPIO_INPUT | GPIO_PULL_UP)
diff --git a/board/copano/gpio.inc b/board/copano/gpio.inc
index 3159821e94..52be1271f1 100644
--- a/board/copano/gpio.inc
+++ b/board/copano/gpio.inc
@@ -168,7 +168,7 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
/* Unused signals */
GPIO(UNUSED_GPIOD4, PIN(D, 4), GPIO_INPUT | GPIO_PULL_UP)
diff --git a/board/delbin/gpio.inc b/board/delbin/gpio.inc
index 333c638b0a..61dae06cde 100644
--- a/board/delbin/gpio.inc
+++ b/board/delbin/gpio.inc
@@ -175,4 +175,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/drobit/gpio.inc b/board/drobit/gpio.inc
index bc7d625195..6bacab4474 100644
--- a/board/drobit/gpio.inc
+++ b/board/drobit/gpio.inc
@@ -180,5 +180,5 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/eldrid/gpio.inc b/board/eldrid/gpio.inc
index 1006391c4e..9d5b374c40 100644
--- a/board/eldrid/gpio.inc
+++ b/board/eldrid/gpio.inc
@@ -179,4 +179,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/elemi/gpio.inc b/board/elemi/gpio.inc
index 934e26ce2b..9886497e24 100644
--- a/board/elemi/gpio.inc
+++ b/board/elemi/gpio.inc
@@ -166,4 +166,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/halvor/gpio.inc b/board/halvor/gpio.inc
index fdf9402f27..71823773e3 100644
--- a/board/halvor/gpio.inc
+++ b/board/halvor/gpio.inc
@@ -180,4 +180,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/lindar/gpio.inc b/board/lindar/gpio.inc
index 246b83cd3f..30dd2a3920 100644
--- a/board/lindar/gpio.inc
+++ b/board/lindar/gpio.inc
@@ -169,7 +169,7 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
/* Unused signals */
GPIO(UNUSED_GPIO60, PIN(6, 0), GPIO_INPUT | GPIO_PULL_UP)
diff --git a/board/lingcod/gpio.inc b/board/lingcod/gpio.inc
index 52bce7b2ce..14817a622c 100644
--- a/board/lingcod/gpio.inc
+++ b/board/lingcod/gpio.inc
@@ -160,4 +160,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/malefor/gpio.inc b/board/malefor/gpio.inc
index 6f770eb17a..5723a878c7 100644
--- a/board/malefor/gpio.inc
+++ b/board/malefor/gpio.inc
@@ -160,4 +160,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/terrador/gpio.inc b/board/terrador/gpio.inc
index 3ec22924f9..f32b8328e3 100644
--- a/board/terrador/gpio.inc
+++ b/board/terrador/gpio.inc
@@ -169,4 +169,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/todor/gpio.inc b/board/todor/gpio.inc
index 606a17fcb6..270ce49a3d 100644
--- a/board/todor/gpio.inc
+++ b/board/todor/gpio.inc
@@ -167,4 +167,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/trondo/gpio.inc b/board/trondo/gpio.inc
index eee76df08b..dbf50c7608 100644
--- a/board/trondo/gpio.inc
+++ b/board/trondo/gpio.inc
@@ -157,4 +157,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/voema/gpio.inc b/board/voema/gpio.inc
index 8379e5f12a..4273fb8974 100644
--- a/board/voema/gpio.inc
+++ b/board/voema/gpio.inc
@@ -180,5 +180,5 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/volet/gpio.inc b/board/volet/gpio.inc
index ed4b426a86..bf5377a716 100644
--- a/board/volet/gpio.inc
+++ b/board/volet/gpio.inc
@@ -181,4 +181,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc
index 33d04741d3..89cfe9c5bd 100644
--- a/board/volteer/gpio.inc
+++ b/board/volteer/gpio.inc
@@ -184,5 +184,5 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
diff --git a/board/voxel/gpio.inc b/board/voxel/gpio.inc
index fa3d0ffe7d..5c16ff02bc 100644
--- a/board/voxel/gpio.inc
+++ b/board/voxel/gpio.inc
@@ -183,4 +183,4 @@ ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* GPIO00 =
/* Temperature sensors */
ALTERNATE(PIN_MASK(4, BIT(2) | BIT(4) | BIT(5)), 0, MODULE_ADC, 0) /* TEMP_SENSOR1,2,4 */
-ALTERNATE(PIN(F, 1), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
+ALTERNATE(PIN_MASK(F, BIT(1)), 0, MODULE_ADC, 0) /* TEMP_SENSOR3 */
View Lorry Controller Status