From 6feec999556cc9d6622a3e05f896a4db5f5ceb24 Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Fri, 12 Nov 2021 13:22:18 -0600 Subject: Revert "GPIO/IOEX/eSPI: Give different IO signals unique values" This reverts commit 9f392b0d616f6fec17d213736e6bf9f4217392e4. BUG=b:200823466 TEST=make buildall -j Change-Id: If593116d7a0f09929a03652c500ab482b68dfc74 Signed-off-by: Mary Ruthven Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3285754 Reviewed-by: Vadim Sukhomlinov --- include/gpio_signal.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/include/gpio_signal.h b/include/gpio_signal.h index 5d629640c9..776e84fdae 100644 --- a/include/gpio_signal.h +++ b/include/gpio_signal.h @@ -6,28 +6,13 @@ #ifndef __CROS_EC_GPIO_SIGNAL_H #define __CROS_EC_GPIO_SIGNAL_H -#include "compile_time_macros.h" - -/* - * There are 3 different IO signal types used by the EC. - * Ensure they each use a unique range of values so we can tell them apart. - * 1) Local GPIO => 0 to 0x0FFF - * 2) IO expander GPIO => 0x1000 to 0x1FFF - * 3) eSPI virtual wire signals (defined in include/espi.h) => 0x2000 to 0x2FFF - */ - #define GPIO(name, pin, flags) GPIO_##name, #define UNIMPLEMENTED(name) GPIO_##name, #define GPIO_INT(name, pin, flags, signal) GPIO_##name, -#define GPIO_SIGNAL_START 0 /* The first valid GPIO signal is 0 */ - enum gpio_signal { #include "gpio.wrap" - GPIO_COUNT, - /* Ensure that sizeof gpio_signal is large enough for ioex_signal */ - GPIO_LIMIT = 0x0FFF + GPIO_COUNT }; -BUILD_ASSERT(GPIO_COUNT < GPIO_LIMIT); #endif /* __CROS_EC_GPIO_SIGNAL_H */ -- cgit v1.2.1