summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2020-09-14 15:04:37 -0700
committerCommit Bot <commit-bot@chromium.org>2020-09-16 19:54:23 +0000
commit81fcfcc39df8e7d9dcb91d516416e790f0f90db6 (patch)
treea5e57414749b15bd16118fb5299c23689af14c39
parentee3c56a04cd0888b1005fd75d8be186ef3c49ca2 (diff)
downloadchrome-ec-81fcfcc39df8e7d9dcb91d516416e790f0f90db6.tar.gz
Trogdor: Move GPIO aliases from baseboard to board
Move some GPIO aliases from baseboard to board such that they can be customized to use different names. BRANCH=None BUG=b:167884598 TEST=Built the affect Trogdor boards. Change-Id: Id8d68d9b03d43010a81565f7625b8033aab14594 Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2410850 Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-rw-r--r--baseboard/trogdor/baseboard.h2
-rw-r--r--board/coachz/board.h2
-rw-r--r--board/lazor/board.h2
-rw-r--r--board/pompom/board.h2
-rw-r--r--board/trogdor/board.h4
5 files changed, 10 insertions, 2 deletions
diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h
index f5adacbcd2..1cba3c1371 100644
--- a/baseboard/trogdor/baseboard.h
+++ b/baseboard/trogdor/baseboard.h
@@ -155,11 +155,9 @@
* then redefined here to so it's more clear which signal is being used for
* which purpose.
*/
-#define GPIO_AC_PRESENT GPIO_ACOK_OD
#define GPIO_POWER_BUTTON_L GPIO_EC_PWR_BTN_ODL
#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL
#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL
-#define GPIO_WP_L GPIO_EC_WP_ODL
#define GPIO_LID_OPEN GPIO_LID_OPEN_EC
#define GPIO_SHI_CS_L GPIO_AP_EC_SPI_CS_L
#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW
diff --git a/board/coachz/board.h b/board/coachz/board.h
index 96aa37545a..bb14f39a7e 100644
--- a/board/coachz/board.h
+++ b/board/coachz/board.h
@@ -67,6 +67,8 @@
#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L
/* GPIO alias */
+#define GPIO_AC_PRESENT GPIO_ACOK_OD
+#define GPIO_WP_L GPIO_EC_WP_ODL
#define GPIO_PMIC_RESIN_L GPIO_PM845_RESIN_L
#define GPIO_SWITCHCAP_PG_INT_L GPIO_DA9313_GPIO0
#define GPIO_SWITCHCAP_ON_L GPIO_SWITCHCAP_ON
diff --git a/board/lazor/board.h b/board/lazor/board.h
index 453d2e334d..41557960bf 100644
--- a/board/lazor/board.h
+++ b/board/lazor/board.h
@@ -67,6 +67,8 @@
#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L
/* GPIO alias */
+#define GPIO_AC_PRESENT GPIO_ACOK_OD
+#define GPIO_WP_L GPIO_EC_WP_ODL
#define GPIO_PMIC_RESIN_L GPIO_PM845_RESIN_L
#define GPIO_SWITCHCAP_PG_INT_L GPIO_DA9313_GPIO0
#define GPIO_SWITCHCAP_ON_L GPIO_SWITCHCAP_ON
diff --git a/board/pompom/board.h b/board/pompom/board.h
index ac7cf8e85c..598dae781e 100644
--- a/board/pompom/board.h
+++ b/board/pompom/board.h
@@ -62,6 +62,8 @@
#define GMR_TABLET_MODE_GPIO_L GPIO_LID_360_L
/* GPIO alias */
+#define GPIO_AC_PRESENT GPIO_ACOK_OD
+#define GPIO_WP_L GPIO_EC_WP_ODL
#define GPIO_EC_RST_ODL GPIO_EC_RST_ODL_GPIO02
#define GPIO_PMIC_RESIN_L GPIO_PM7180_RESIN_D_L
diff --git a/board/trogdor/board.h b/board/trogdor/board.h
index 84d9305606..261977f375 100644
--- a/board/trogdor/board.h
+++ b/board/trogdor/board.h
@@ -49,6 +49,10 @@
TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
#define OPT3001_I2C_ADDR_FLAGS OPT3001_I2C_ADDR1_FLAGS
+/* GPIO alias */
+#define GPIO_AC_PRESENT GPIO_ACOK_OD
+#define GPIO_WP_L GPIO_EC_WP_ODL
+
#ifndef __ASSEMBLER__
#include "gpio_signal.h"