summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2021-06-28 09:57:51 -0700
committerCommit Bot <commit-bot@chromium.org>2021-07-13 22:14:12 +0000
commit99abd9fd14adc31e25242a953a813b938211aa9f (patch)
treedf19e4ebb3ae040fda0d1243926df7ec29ba3033
parent1f05c52d4e434fde0de9ccbfe5e7f418abec7c4f (diff)
downloadchrome-ec-99abd9fd14adc31e25242a953a813b938211aa9f.tar.gz
herobrine: Move GPIO alias to the board level
Move the GPIO alias of EN_PP5000 from the baseboard level to the board level. The new Herobrine hardware will use a different name. BRANCH=None BUG=b:192253134 TEST=Built the herobrine_npcx7 EC-OS and Zephyr images successfully. Change-Id: I903b2646bfc39ce19713a35cd037402003f82591 Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2993212 Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r--baseboard/herobrine/baseboard.h1
-rw-r--r--board/herobrine_npcx7/board.h9
2 files changed, 5 insertions, 5 deletions
diff --git a/baseboard/herobrine/baseboard.h b/baseboard/herobrine/baseboard.h
index f91bb47e7d..6e7ecc2327 100644
--- a/baseboard/herobrine/baseboard.h
+++ b/baseboard/herobrine/baseboard.h
@@ -168,7 +168,6 @@
#define GPIO_SHI_CS_L GPIO_AP_EC_SPI_CS_L
#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW
#define GPIO_BATT_PRES_ODL GPIO_EC_BATT_PRES_ODL
-#define GPIO_EN_PP5000 GPIO_EN_PP5000_A
#define GPIO_ENABLE_BACKLIGHT GPIO_EC_BL_DISABLE_L
#define GPIO_BOARD_VERSION1 GPIO_BRD_ID0
#define GPIO_BOARD_VERSION2 GPIO_BRD_ID1
diff --git a/board/herobrine_npcx7/board.h b/board/herobrine_npcx7/board.h
index b2539ba866..197cf01209 100644
--- a/board/herobrine_npcx7/board.h
+++ b/board/herobrine_npcx7/board.h
@@ -66,10 +66,11 @@
#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_SWITCHCAP_PG GPIO_SWITCHCAP_GPIO_1
-#define GPIO_ACOK_OD GPIO_CHG_ACOK_OD
+#define GPIO_AC_PRESENT GPIO_ACOK_OD
+#define GPIO_WP_L GPIO_EC_WP_ODL
+#define GPIO_SWITCHCAP_PG GPIO_SWITCHCAP_GPIO_1
+#define GPIO_ACOK_OD GPIO_CHG_ACOK_OD
+#define GPIO_EN_PP5000 GPIO_EN_PP5000_A
#ifndef __ASSEMBLER__