Change in ...coreboot[master]: mainboard: remove "recovery" gpio, selectively add "presence" gpio.

[Matt Delco (Code Review)]

Matt Delco has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32718

Change subject: mainboard: remove "recovery" gpio, selectively add "presence" gpio.
......................................................................

mainboard: remove "recovery" gpio, selectively add "presence" gpio.

The gpio table is only used by depthcharge, and depthcharge rarely
has a need for the "recovery" gpio.  On a few boards it does use the
gpio as a signal for confirming physical presence, so on that boards
we'll advertise the board as "presence".

All these strings probably should have been #defines to help avoid
typos (e.g., the "ec_in_rw" in stout seems questionable since everybody
else uses "EC in RW").

Cq-Depend: chromium:1580454
BUG=b:129471321
BRANCH=None
TEST=Local compile and flash (with corresponding changes to depthcharge)
to 2 systems, one with a "presence" gpio and another without.  Confirmed
that both systems could enter dev mode.

Change-Id: Id6d62d9e48d3e6646cbc1277ea53f0ca95dd849e
Signed-off-by: Matt Delco 
---
M src/mainboard/google/auron/chromeos.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/cyan/chromeos.c
M src/mainboard/google/daisy/chromeos.c
M src/mainboard/google/dragonegg/chromeos.c
M src/mainboard/google/eve/chromeos.c
M src/mainboard/google/fizz/chromeos.c
M src/mainboard/google/foster/chromeos.c
M src/mainboard/google/gale/chromeos.c
M src/mainboard/google/glados/chromeos.c
M src/mainboard/google/gru/chromeos.c
M src/mainboard/google/hatch/chromeos.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/kahlee/chromeos.c
M src/mainboard/google/kukui/chromeos.c
M src/mainboard/google/link/chromeos.c
M src/mainboard/google/nyan/chromeos.c
M src/mainboard/google/nyan_big/chromeos.c
M src/mainboard/google/nyan_blaze/chromeos.c
M src/mainboard/google/oak/chromeos.c
M src/mainboard/google/octopus/chromeos.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/peach_pit/chromeos.c
M src/mainboard/google/poppy/chromeos.c
M src/mainboard/google/rambi/chromeos.c
M src/mainboard/google/reef/chromeos.c
M src/mainboard/google/sarien/chromeos.c
M src/mainboard/google/slippy/chromeos.c
M src/mainboard/google/smaug/chromeos.c
M src/mainboard/google/storm/chromeos.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/google/veyron/chromeos.c
M src/mainboard/google/veyron_mickey/chromeos.c
M src/mainboard/google/veyron_rialto/chromeos.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/cannonlake_rvp/chromeos.c
M src/mainboard/intel/coffeelake_rvp/chromeos.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/glkrvp/chromeos.c
M src/mainboard/intel/icelake_rvp/chromeos.c
M src/mainboard/intel/kblrvp/chromeos.c
M src/mainboard/intel/kunimitsu/chromeos.c
M src/mainboard/intel/strago/chromeos.c
M src/mainboard/intel/wtm2/chromeos.c
M src/mainboard/samsung/lumpy/chromeos.c
M src/mainboard/samsung/stumpy/chromeos.c
47 files changed, 10 insertions(+), 64 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/32718/1

diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index 942e9dd..0147a31 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -27,7 +27,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{CROS_WP_GPIO, ACTIVE_HIGH, get_write_protect_state(),
    	 "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 92bb7b4..e695ab5 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -36,7 +36,7 @@
    	{GPIO_SPI_WP, ACTIVE_HIGH,
    		get_write_protect_state(), "write protect"},
    	{GPIO_REC_MODE, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{-1, ACTIVE_HIGH, 1, "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 2301d3e..7f72ad2 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -40,9 +40,6 @@
    	{WP_GPIO, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},

-		/* Recovery: virtual GPIO active high */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* lid switch value from EC */
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 44101e3..5d5bc55 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -35,7 +35,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index 968f1f9..974cd49 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -29,9 +29,6 @@
    	{EXYNOS5_GPD1, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},

-		/* Recovery: active low */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid: active high (LID_GPIO) */
    	{EXYNOS5_GPX3, ACTIVE_HIGH, gpio_get_value(GPIO_X35), "lid"},

diff --git a/src/mainboard/google/dragonegg/chromeos.c b/src/mainboard/google/dragonegg/chromeos.c
index 657320c..7132b04 100644
--- a/src/mainboard/google/dragonegg/chromeos.c
+++ b/src/mainboard/google/dragonegg/chromeos.c
@@ -28,7 +28,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/eve/chromeos.c b/src/mainboard/google/eve/chromeos.c
index 06a4de9..8c276e9 100644
--- a/src/mainboard/google/eve/chromeos.c
+++ b/src/mainboard/google/eve/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/fizz/chromeos.c b/src/mainboard/google/fizz/chromeos.c
index 3bd5b64..31887c5 100644
--- a/src/mainboard/google/fizz/chromeos.c
+++ b/src/mainboard/google/fizz/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, 1, "lid"}, /* Lid switch always open */
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index 591cfd0..7ce1300 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -28,9 +28,6 @@
    	/* Write Protect: active low */
    	{-1, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

-		/* Recovery: active high */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* TODO: Power: active low / high depending on board id */
    	{GPIO(X5), ACTIVE_LOW, -1, "power"},

diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index 69c3a7a..d0bdbb0 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -68,8 +68,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{PP_SW, ACTIVE_LOW, read_gpio(PP_SW), "presence"},
-		{get_rec_sw_gpio_pin(), ACTIVE_LOW,
-			read_gpio(get_rec_sw_gpio_pin()), "recovery"},
    	{get_wp_status_gpio_pin(), ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
    	{-1, ACTIVE_LOW, 1, "power"},
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index f826b55..b6029dd 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -26,7 +26,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/gru/chromeos.c b/src/mainboard/google/gru/chromeos.c
index 53d00fb..c92a492 100644
--- a/src/mainboard/google/gru/chromeos.c
+++ b/src/mainboard/google/gru/chromeos.c
@@ -34,7 +34,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO_WP.raw, wp_polarity,
    	 get_write_protect_state() ^ !wp_polarity, "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
 #if CONFIG(GRU_BASEBOARD_SCARLET)
    	{GPIO_BACKLIGHT.raw, ACTIVE_HIGH, -1, "backlight"},
 #endif
diff --git a/src/mainboard/google/hatch/chromeos.c b/src/mainboard/google/hatch/chromeos.c
index fa54148..4119670 100644
--- a/src/mainboard/google/hatch/chromeos.c
+++ b/src/mainboard/google/hatch/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index b3215a0..2b72cae 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -37,7 +37,7 @@
    	{GPIO_SPI_WP, ACTIVE_HIGH,
    		get_write_protect_state(), "write protect"},
    	{GPIO_REC_MODE, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{-1, ACTIVE_HIGH, 1, "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/kahlee/chromeos.c b/src/mainboard/google/kahlee/chromeos.c
index 3bce66b..195eb94 100644
--- a/src/mainboard/google/kahlee/chromeos.c
+++ b/src/mainboard/google/kahlee/chromeos.c
@@ -24,7 +24,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{GPIO_EC_IN_RW, ACTIVE_HIGH, gpio_get(GPIO_EC_IN_RW),
diff --git a/src/mainboard/google/kukui/chromeos.c b/src/mainboard/google/kukui/chromeos.c
index 3539501..2cef10e 100644
--- a/src/mainboard/google/kukui/chromeos.c
+++ b/src/mainboard/google/kukui/chromeos.c
@@ -35,7 +35,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO_WP.id, ACTIVE_LOW,
    	 !get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{EC_IN_RW.id, ACTIVE_HIGH, -1, "EC in RW"},
    	{EC_IRQ.id, ACTIVE_LOW, -1, "EC interrupt"},
    	{CR50_IRQ.id, ACTIVE_HIGH, -1, "TPM interrupt"},
diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c
index 5156404..ecd7592 100644
--- a/src/mainboard/google/link/chromeos.c
+++ b/src/mainboard/google/link/chromeos.c
@@ -28,10 +28,6 @@
    	/* Write Protect: GPIO57 = PCH_SPI_WP_D */
    	{57, ACTIVE_HIGH, get_write_protect_state(), "write protect"},

-		/* Recovery: the "switch" comes from the EC */
-		/* -1 indicates that this is a pseudo GPIO */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid: the "switch" comes from the EC */
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index ba851c7..e3e09e6 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -22,7 +22,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO(R1), ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
    	{GPIO(Q0), ACTIVE_LOW, -1, "power"},
    	{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index f297998..1fbaac7 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -22,7 +22,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO(R1), ACTIVE_LOW,
    	 !get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
    	{GPIO(Q0), ACTIVE_LOW, -1, "power"},
    	{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index dbbd91f..bbb274f 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -22,7 +22,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO(R1), ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
    	{GPIO(Q0), ACTIVE_LOW, -1, "power"},
    	{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/oak/chromeos.c b/src/mainboard/google/oak/chromeos.c
index 4e07236..b613cc3 100644
--- a/src/mainboard/google/oak/chromeos.c
+++ b/src/mainboard/google/oak/chromeos.c
@@ -36,7 +36,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{WRITE_PROTECT.id, ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{LID.id, ACTIVE_HIGH, -1, "lid"},
    	{POWER_BUTTON.id, ACTIVE_HIGH, -1, "power"},
    	{EC_IN_RW.id, ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/octopus/chromeos.c b/src/mainboard/google/octopus/chromeos.c
index 5eb3990..ca9f6fb 100644
--- a/src/mainboard/google/octopus/chromeos.c
+++ b/src/mainboard/google/octopus/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index f17b6a6..095d504 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -39,9 +39,6 @@
    	/* Write Protect: GPIO70 active high */
    	{70, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

-		/* Recovery: Virtual GPIO in the EC (Servo GPIO68 active low) */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid switch GPIO active high (open). */
    	{15, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c
index b2d90d9..8bd35be 100644
--- a/src/mainboard/google/peach_pit/chromeos.c
+++ b/src/mainboard/google/peach_pit/chromeos.c
@@ -29,9 +29,6 @@
    	{EXYNOS5_GPX3, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},

-		/* Recovery: active low */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid: active high (LID_GPIO) */
    	{EXYNOS5_GPX3, ACTIVE_HIGH, gpio_get_value(GPIO_X34), "lid"},

diff --git a/src/mainboard/google/poppy/chromeos.c b/src/mainboard/google/poppy/chromeos.c
index 83b8aa0..3879732 100644
--- a/src/mainboard/google/poppy/chromeos.c
+++ b/src/mainboard/google/poppy/chromeos.c
@@ -28,7 +28,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index d47a323..7880154 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/reef/chromeos.c b/src/mainboard/google/reef/chromeos.c
index 7b7f2b8..4dbbe6d 100644
--- a/src/mainboard/google/reef/chromeos.c
+++ b/src/mainboard/google/reef/chromeos.c
@@ -24,7 +24,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index 15670d0..fafc469 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -36,8 +36,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO_PCH_WP, ACTIVE_HIGH, get_write_protect_state(),
    	 "write protect"},
-		{GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
-		 "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index 15779ee..f52bace 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{58, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index 567a3ae..3d36cd9 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -23,7 +23,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{WRITE_PROTECT_L, ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{POWER_BUTTON, ACTIVE_LOW, -1, "power"},
    	{EC_IN_RW, ACTIVE_HIGH, -1, "EC in RW"},
    	{AP_SYS_RESET_L, ACTIVE_LOW, -1, "reset"},
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index ccc0b53..9587c3c 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -39,7 +39,7 @@
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
    struct lb_gpio chromeos_gpios[] = {
-		{REC_SW, ACTIVE_LOW, read_gpio(REC_SW), "recovery"},
+		{DEV_SW, ACTIVE_LOW, read_gpio(REC_SW), "presence"},
    	{WP_SW, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},
    	{-1, ACTIVE_LOW, 1, "power"},
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index 015e0aa..60c7a09 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -35,9 +35,6 @@
    	/* Write Protect: GPIO7 */
    	{7, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

-		/* Recovery: Virtual switch */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid Switch: Virtual switch */
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index 357a7fc..d27b4dd 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -43,7 +43,7 @@
    	{GPIO_WP.raw, ACTIVE_LOW, !get_write_protect_state(),
    		"write protect"},
    	{GPIO_RECOVERY.raw, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{GPIO_LID.raw, ACTIVE_HIGH, -1, "lid"},
    	{GPIO_POWER.raw, ACTIVE_LOW, -1, "power"},
    	{GPIO_ECINRW.raw, ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index 46a6738..c549e70 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -34,7 +34,7 @@
    	{GPIO_WP.raw, ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
    	{GPIO_RECOVERY.raw, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
    };
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index e86d863..65866f3 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -41,7 +41,7 @@
    	/* Note for early development, we want to support both servo
    	 * and pushkey recovery buttons in firmware boot stages. */
    	{GPIO_RECOVERY_PUSHKEY.raw, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{GPIO_POWER.raw, ACTIVE_LOW, -1, "power"},
    	{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
    };
diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c
index f1fd3ed..1673622 100644
--- a/src/mainboard/intel/baskingridge/chromeos.c
+++ b/src/mainboard/intel/baskingridge/chromeos.c
@@ -33,7 +33,7 @@
    	{0, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

/* Recovery: GPIO69 - SV_DETECT - J8E3 (silkscreen: J8E2) */
-		{69, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
+		{69, ACTIVE_HIGH, get_recovery_mode_switch(), "presence"},

/* Hard code the lid switch GPIO to open. */
    	{-1, ACTIVE_HIGH, 1, "lid"},
diff --git a/src/mainboard/intel/cannonlake_rvp/chromeos.c b/src/mainboard/intel/cannonlake_rvp/chromeos.c
index 296a3a5..44254bc 100644
--- a/src/mainboard/intel/cannonlake_rvp/chromeos.c
+++ b/src/mainboard/intel/cannonlake_rvp/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos.c b/src/mainboard/intel/coffeelake_rvp/chromeos.c
index 84f5f27..a581217 100644
--- a/src/mainboard/intel/coffeelake_rvp/chromeos.c
+++ b/src/mainboard/intel/coffeelake_rvp/chromeos.c
@@ -26,7 +26,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c
index 78610d3..219eefb 100644
--- a/src/mainboard/intel/emeraldlake2/chromeos.c
+++ b/src/mainboard/intel/emeraldlake2/chromeos.c
@@ -33,7 +33,7 @@
    	{48, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

/* Recovery: GPIO22 */
-		{22, ACTIVE_LOW, !get_recovery_mode_switch(), "recovery"},
+		{22, ACTIVE_LOW, !get_recovery_mode_switch(), "presence"},

/* Hard code the lid switch GPIO to open. */
    	{-1, ACTIVE_HIGH, 1, "lid"},
diff --git a/src/mainboard/intel/glkrvp/chromeos.c b/src/mainboard/intel/glkrvp/chromeos.c
index 07d92e9..4edd4a0 100644
--- a/src/mainboard/intel/glkrvp/chromeos.c
+++ b/src/mainboard/intel/glkrvp/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/icelake_rvp/chromeos.c b/src/mainboard/intel/icelake_rvp/chromeos.c
index 5965d95..ce8e548 100644
--- a/src/mainboard/intel/icelake_rvp/chromeos.c
+++ b/src/mainboard/intel/icelake_rvp/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 5168074..ff93d27 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -31,7 +31,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index f7a9d52..6422488 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/strago/chromeos.c b/src/mainboard/intel/strago/chromeos.c
index 03eff1b..df36b38 100644
--- a/src/mainboard/intel/strago/chromeos.c
+++ b/src/mainboard/intel/strago/chromeos.c
@@ -29,7 +29,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index 0f5cfbb..8022214 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -29,7 +29,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, 1, "lid"}, // force open
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c
index 2d4fb61..6760f03 100644
--- a/src/mainboard/samsung/lumpy/chromeos.c
+++ b/src/mainboard/samsung/lumpy/chromeos.c
@@ -47,7 +47,7 @@

/* Recovery: GPIO42 = CHP3_REC_MODE# */
    	{GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
-		 "recovery"},
+		 "presence"},

{100, ACTIVE_HIGH, lid & 1, "lid"},

diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c
index b1ad137..9ec4218 100644
--- a/src/mainboard/samsung/stumpy/chromeos.c
+++ b/src/mainboard/samsung/stumpy/chromeos.c
@@ -43,7 +43,7 @@

/* Recovery: GPIO42 = CHP3_REC_MODE# */
    	{GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
-		 "recovery"},
+		 "presence"},

/* Hard code the lid switch GPIO to open. */
    	{100, ACTIVE_HIGH, 1, "lid"},

[Duncan Laurie (Code Review)]

Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32718 )

Change subject: mainboard: remove "recovery" gpio, selectively add "presence" gpio.
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/#/c/32718/1/src/mainboard/google/storm/chromeos.... 
File src/mainboard/google/storm/chromeos.c:

https://review.coreboot.org/#/c/32718/1/src/mainboard/google/storm/chromeos.... 
PS1, Line 42: DEV_SW
Why did this change to DEV_SW?

[Matt Delco (Code Review)]

Matt Delco has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32718 )

Change subject: mainboard: remove "recovery" gpio, selectively add "presence" gpio.
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/#/c/32718/1/src/mainboard/google/storm/chromeos.... 
File src/mainboard/google/storm/chromeos.c:

https://review.coreboot.org/#/c/32718/1/src/mainboard/google/storm/chromeos.... 
PS1, Line 42: DEV_SW
> Why did this change to DEV_SW?

The change to DEV_SW was requested by Julius here:

https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+...

quoting here:

"Actually, I think this is a mistake I made in https://review.coreboot.org/18980 -- I didn't notice that depthcharge was looking for that "developer" GPIO in board.c for this board. Looks like the original intent was that physical presence is asserted with DEV_SW here, so we should probably pass that as "presence". (Nobody will every build this from ToT anymore so it's kinda moot, but might as well try to do the right thing...)"

[Duncan Laurie (Code Review)]

Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32718 )

Change subject: mainboard: remove "recovery" gpio, selectively add "presence" gpio.
......................................................................

Patch Set 1: Code-Review+2

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32718 )

Change subject: mainboard: remove "recovery" gpio, selectively add "presence" gpio.
......................................................................

Patch Set 1: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32718 )

Change subject: mainboard: remove "recovery" gpio, selectively add "presence" gpio.
......................................................................

mainboard: remove "recovery" gpio, selectively add "presence" gpio.

The gpio table is only used by depthcharge, and depthcharge rarely
has a need for the "recovery" gpio.  On a few boards it does use the
gpio as a signal for confirming physical presence, so on that boards
we'll advertise the board as "presence".

All these strings probably should have been #defines to help avoid
typos (e.g., the "ec_in_rw" in stout seems questionable since everybody
else uses "EC in RW").

Cq-Depend: chromium:1580454
BUG=b:129471321
BRANCH=None
TEST=Local compile and flash (with corresponding changes to depthcharge)
to 2 systems, one with a "presence" gpio and another without.  Confirmed
that both systems could enter dev mode.

Change-Id: Id6d62d9e48d3e6646cbc1277ea53f0ca95dd849e
Signed-off-by: Matt Delco 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32718
Tested-by: build bot (Jenkins) 
Reviewed-by: Duncan Laurie 
Reviewed-by: Julius Werner 
---
M src/mainboard/google/auron/chromeos.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/cyan/chromeos.c
M src/mainboard/google/daisy/chromeos.c
M src/mainboard/google/dragonegg/chromeos.c
M src/mainboard/google/eve/chromeos.c
M src/mainboard/google/fizz/chromeos.c
M src/mainboard/google/foster/chromeos.c
M src/mainboard/google/gale/chromeos.c
M src/mainboard/google/glados/chromeos.c
M src/mainboard/google/gru/chromeos.c
M src/mainboard/google/hatch/chromeos.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/kahlee/chromeos.c
M src/mainboard/google/kukui/chromeos.c
M src/mainboard/google/link/chromeos.c
M src/mainboard/google/nyan/chromeos.c
M src/mainboard/google/nyan_big/chromeos.c
M src/mainboard/google/nyan_blaze/chromeos.c
M src/mainboard/google/oak/chromeos.c
M src/mainboard/google/octopus/chromeos.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/peach_pit/chromeos.c
M src/mainboard/google/poppy/chromeos.c
M src/mainboard/google/rambi/chromeos.c
M src/mainboard/google/reef/chromeos.c
M src/mainboard/google/sarien/chromeos.c
M src/mainboard/google/slippy/chromeos.c
M src/mainboard/google/smaug/chromeos.c
M src/mainboard/google/storm/chromeos.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/google/veyron/chromeos.c
M src/mainboard/google/veyron_mickey/chromeos.c
M src/mainboard/google/veyron_rialto/chromeos.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/cannonlake_rvp/chromeos.c
M src/mainboard/intel/coffeelake_rvp/chromeos.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/glkrvp/chromeos.c
M src/mainboard/intel/icelake_rvp/chromeos.c
M src/mainboard/intel/kblrvp/chromeos.c
M src/mainboard/intel/kunimitsu/chromeos.c
M src/mainboard/intel/strago/chromeos.c
M src/mainboard/intel/wtm2/chromeos.c
M src/mainboard/samsung/lumpy/chromeos.c
M src/mainboard/samsung/stumpy/chromeos.c
47 files changed, 10 insertions(+), 64 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Duncan Laurie: Looks good to me, approved
  Julius Werner: Looks good to me, approved

diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index 942e9dd..0147a31 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -27,7 +27,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{CROS_WP_GPIO, ACTIVE_HIGH, get_write_protect_state(),
    	 "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 92bb7b4..e695ab5 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -36,7 +36,7 @@
    	{GPIO_SPI_WP, ACTIVE_HIGH,
    		get_write_protect_state(), "write protect"},
    	{GPIO_REC_MODE, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{-1, ACTIVE_HIGH, 1, "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 2301d3e..7f72ad2 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -40,9 +40,6 @@
    	{WP_GPIO, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},

-		/* Recovery: virtual GPIO active high */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* lid switch value from EC */
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 44101e3..5d5bc55 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -35,7 +35,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index 968f1f9..974cd49 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -29,9 +29,6 @@
    	{EXYNOS5_GPD1, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},

-		/* Recovery: active low */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid: active high (LID_GPIO) */
    	{EXYNOS5_GPX3, ACTIVE_HIGH, gpio_get_value(GPIO_X35), "lid"},

diff --git a/src/mainboard/google/dragonegg/chromeos.c b/src/mainboard/google/dragonegg/chromeos.c
index 657320c..7132b04 100644
--- a/src/mainboard/google/dragonegg/chromeos.c
+++ b/src/mainboard/google/dragonegg/chromeos.c
@@ -28,7 +28,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/eve/chromeos.c b/src/mainboard/google/eve/chromeos.c
index 06a4de9..8c276e9 100644
--- a/src/mainboard/google/eve/chromeos.c
+++ b/src/mainboard/google/eve/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/fizz/chromeos.c b/src/mainboard/google/fizz/chromeos.c
index 3bd5b64..31887c5 100644
--- a/src/mainboard/google/fizz/chromeos.c
+++ b/src/mainboard/google/fizz/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, 1, "lid"}, /* Lid switch always open */
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index 591cfd0..7ce1300 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -28,9 +28,6 @@
    	/* Write Protect: active low */
    	{-1, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

-		/* Recovery: active high */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* TODO: Power: active low / high depending on board id */
    	{GPIO(X5), ACTIVE_LOW, -1, "power"},

diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index 69c3a7a..d0bdbb0 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -68,8 +68,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{PP_SW, ACTIVE_LOW, read_gpio(PP_SW), "presence"},
-		{get_rec_sw_gpio_pin(), ACTIVE_LOW,
-			read_gpio(get_rec_sw_gpio_pin()), "recovery"},
    	{get_wp_status_gpio_pin(), ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
    	{-1, ACTIVE_LOW, 1, "power"},
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index f826b55..b6029dd 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -26,7 +26,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/gru/chromeos.c b/src/mainboard/google/gru/chromeos.c
index 53d00fb..c92a492 100644
--- a/src/mainboard/google/gru/chromeos.c
+++ b/src/mainboard/google/gru/chromeos.c
@@ -34,7 +34,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO_WP.raw, wp_polarity,
    	 get_write_protect_state() ^ !wp_polarity, "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
 #if CONFIG(GRU_BASEBOARD_SCARLET)
    	{GPIO_BACKLIGHT.raw, ACTIVE_HIGH, -1, "backlight"},
 #endif
diff --git a/src/mainboard/google/hatch/chromeos.c b/src/mainboard/google/hatch/chromeos.c
index fa54148..4119670 100644
--- a/src/mainboard/google/hatch/chromeos.c
+++ b/src/mainboard/google/hatch/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index b3215a0..2b72cae 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -37,7 +37,7 @@
    	{GPIO_SPI_WP, ACTIVE_HIGH,
    		get_write_protect_state(), "write protect"},
    	{GPIO_REC_MODE, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{-1, ACTIVE_HIGH, 1, "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/kahlee/chromeos.c b/src/mainboard/google/kahlee/chromeos.c
index 3bce66b..195eb94 100644
--- a/src/mainboard/google/kahlee/chromeos.c
+++ b/src/mainboard/google/kahlee/chromeos.c
@@ -24,7 +24,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{GPIO_EC_IN_RW, ACTIVE_HIGH, gpio_get(GPIO_EC_IN_RW),
diff --git a/src/mainboard/google/kukui/chromeos.c b/src/mainboard/google/kukui/chromeos.c
index 3539501..2cef10e 100644
--- a/src/mainboard/google/kukui/chromeos.c
+++ b/src/mainboard/google/kukui/chromeos.c
@@ -35,7 +35,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO_WP.id, ACTIVE_LOW,
    	 !get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{EC_IN_RW.id, ACTIVE_HIGH, -1, "EC in RW"},
    	{EC_IRQ.id, ACTIVE_LOW, -1, "EC interrupt"},
    	{CR50_IRQ.id, ACTIVE_HIGH, -1, "TPM interrupt"},
diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c
index 5156404..ecd7592 100644
--- a/src/mainboard/google/link/chromeos.c
+++ b/src/mainboard/google/link/chromeos.c
@@ -28,10 +28,6 @@
    	/* Write Protect: GPIO57 = PCH_SPI_WP_D */
    	{57, ACTIVE_HIGH, get_write_protect_state(), "write protect"},

-		/* Recovery: the "switch" comes from the EC */
-		/* -1 indicates that this is a pseudo GPIO */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid: the "switch" comes from the EC */
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index ba851c7..e3e09e6 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -22,7 +22,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO(R1), ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
    	{GPIO(Q0), ACTIVE_LOW, -1, "power"},
    	{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index f297998..1fbaac7 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -22,7 +22,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO(R1), ACTIVE_LOW,
    	 !get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
    	{GPIO(Q0), ACTIVE_LOW, -1, "power"},
    	{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index dbbd91f..bbb274f 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -22,7 +22,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO(R1), ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
    	{GPIO(Q0), ACTIVE_LOW, -1, "power"},
    	{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/oak/chromeos.c b/src/mainboard/google/oak/chromeos.c
index 4e07236..b613cc3 100644
--- a/src/mainboard/google/oak/chromeos.c
+++ b/src/mainboard/google/oak/chromeos.c
@@ -36,7 +36,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{WRITE_PROTECT.id, ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{LID.id, ACTIVE_HIGH, -1, "lid"},
    	{POWER_BUTTON.id, ACTIVE_HIGH, -1, "power"},
    	{EC_IN_RW.id, ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/octopus/chromeos.c b/src/mainboard/google/octopus/chromeos.c
index 5eb3990..ca9f6fb 100644
--- a/src/mainboard/google/octopus/chromeos.c
+++ b/src/mainboard/google/octopus/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index f17b6a6..095d504 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -39,9 +39,6 @@
    	/* Write Protect: GPIO70 active high */
    	{70, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

-		/* Recovery: Virtual GPIO in the EC (Servo GPIO68 active low) */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid switch GPIO active high (open). */
    	{15, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c
index b2d90d9..8bd35be 100644
--- a/src/mainboard/google/peach_pit/chromeos.c
+++ b/src/mainboard/google/peach_pit/chromeos.c
@@ -29,9 +29,6 @@
    	{EXYNOS5_GPX3, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},

-		/* Recovery: active low */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid: active high (LID_GPIO) */
    	{EXYNOS5_GPX3, ACTIVE_HIGH, gpio_get_value(GPIO_X34), "lid"},

diff --git a/src/mainboard/google/poppy/chromeos.c b/src/mainboard/google/poppy/chromeos.c
index 83b8aa0..3879732 100644
--- a/src/mainboard/google/poppy/chromeos.c
+++ b/src/mainboard/google/poppy/chromeos.c
@@ -28,7 +28,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index d47a323..7880154 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/reef/chromeos.c b/src/mainboard/google/reef/chromeos.c
index 7b7f2b8..4dbbe6d 100644
--- a/src/mainboard/google/reef/chromeos.c
+++ b/src/mainboard/google/reef/chromeos.c
@@ -24,7 +24,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index 15670d0..fafc469 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -36,8 +36,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{GPIO_PCH_WP, ACTIVE_HIGH, get_write_protect_state(),
    	 "write protect"},
-		{GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
-		 "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index 15779ee..f52bace 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{58, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index 567a3ae..3d36cd9 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -23,7 +23,6 @@
    struct lb_gpio chromeos_gpios[] = {
    	{WRITE_PROTECT_L, ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{POWER_BUTTON, ACTIVE_LOW, -1, "power"},
    	{EC_IN_RW, ACTIVE_HIGH, -1, "EC in RW"},
    	{AP_SYS_RESET_L, ACTIVE_LOW, -1, "reset"},
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index ccc0b53..9587c3c 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -39,7 +39,7 @@
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
    struct lb_gpio chromeos_gpios[] = {
-		{REC_SW, ACTIVE_LOW, read_gpio(REC_SW), "recovery"},
+		{DEV_SW, ACTIVE_LOW, read_gpio(REC_SW), "presence"},
    	{WP_SW, ACTIVE_LOW, !get_write_protect_state(),
    	 "write protect"},
    	{-1, ACTIVE_LOW, 1, "power"},
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index 015e0aa..60c7a09 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -35,9 +35,6 @@
    	/* Write Protect: GPIO7 */
    	{7, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

-		/* Recovery: Virtual switch */
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
-
    	/* Lid Switch: Virtual switch */
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},

diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index 357a7fc..d27b4dd 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -43,7 +43,7 @@
    	{GPIO_WP.raw, ACTIVE_LOW, !get_write_protect_state(),
    		"write protect"},
    	{GPIO_RECOVERY.raw, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{GPIO_LID.raw, ACTIVE_HIGH, -1, "lid"},
    	{GPIO_POWER.raw, ACTIVE_LOW, -1, "power"},
    	{GPIO_ECINRW.raw, ACTIVE_HIGH, -1, "EC in RW"},
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index 46a6738..c549e70 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -34,7 +34,7 @@
    	{GPIO_WP.raw, ACTIVE_LOW,
    		!get_write_protect_state(), "write protect"},
    	{GPIO_RECOVERY.raw, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
    };
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index e86d863..65866f3 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -41,7 +41,7 @@
    	/* Note for early development, we want to support both servo
    	 * and pushkey recovery buttons in firmware boot stages. */
    	{GPIO_RECOVERY_PUSHKEY.raw, ACTIVE_LOW,
-			!get_recovery_mode_switch(), "recovery"},
+			!get_recovery_mode_switch(), "presence"},
    	{GPIO_POWER.raw, ACTIVE_LOW, -1, "power"},
    	{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
    };
diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c
index f1fd3ed..1673622 100644
--- a/src/mainboard/intel/baskingridge/chromeos.c
+++ b/src/mainboard/intel/baskingridge/chromeos.c
@@ -33,7 +33,7 @@
    	{0, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

/* Recovery: GPIO69 - SV_DETECT - J8E3 (silkscreen: J8E2) */
-		{69, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
+		{69, ACTIVE_HIGH, get_recovery_mode_switch(), "presence"},

/* Hard code the lid switch GPIO to open. */
    	{-1, ACTIVE_HIGH, 1, "lid"},
diff --git a/src/mainboard/intel/cannonlake_rvp/chromeos.c b/src/mainboard/intel/cannonlake_rvp/chromeos.c
index 296a3a5..44254bc 100644
--- a/src/mainboard/intel/cannonlake_rvp/chromeos.c
+++ b/src/mainboard/intel/cannonlake_rvp/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos.c b/src/mainboard/intel/coffeelake_rvp/chromeos.c
index 84f5f27..a581217 100644
--- a/src/mainboard/intel/coffeelake_rvp/chromeos.c
+++ b/src/mainboard/intel/coffeelake_rvp/chromeos.c
@@ -26,7 +26,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c
index 78610d3..219eefb 100644
--- a/src/mainboard/intel/emeraldlake2/chromeos.c
+++ b/src/mainboard/intel/emeraldlake2/chromeos.c
@@ -33,7 +33,7 @@
    	{48, ACTIVE_LOW, !get_write_protect_state(), "write protect"},

/* Recovery: GPIO22 */
-		{22, ACTIVE_LOW, !get_recovery_mode_switch(), "recovery"},
+		{22, ACTIVE_LOW, !get_recovery_mode_switch(), "presence"},

/* Hard code the lid switch GPIO to open. */
    	{-1, ACTIVE_HIGH, 1, "lid"},
diff --git a/src/mainboard/intel/glkrvp/chromeos.c b/src/mainboard/intel/glkrvp/chromeos.c
index 07d92e9..4edd4a0 100644
--- a/src/mainboard/intel/glkrvp/chromeos.c
+++ b/src/mainboard/intel/glkrvp/chromeos.c
@@ -25,7 +25,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/icelake_rvp/chromeos.c b/src/mainboard/intel/icelake_rvp/chromeos.c
index 5965d95..ce8e548 100644
--- a/src/mainboard/intel/icelake_rvp/chromeos.c
+++ b/src/mainboard/intel/icelake_rvp/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 5168074..ff93d27 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -31,7 +31,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index f7a9d52..6422488 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -27,7 +27,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/strago/chromeos.c b/src/mainboard/intel/strago/chromeos.c
index 03eff1b..df36b38 100644
--- a/src/mainboard/intel/strago/chromeos.c
+++ b/src/mainboard/intel/strago/chromeos.c
@@ -29,7 +29,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
    	{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index 0f5cfbb..8022214 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -29,7 +29,6 @@
 {
    struct lb_gpio chromeos_gpios[] = {
    	{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
-		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
    	{-1, ACTIVE_HIGH, 1, "lid"}, // force open
    	{-1, ACTIVE_HIGH, 0, "power"},
    	{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c
index 2d4fb61..6760f03 100644
--- a/src/mainboard/samsung/lumpy/chromeos.c
+++ b/src/mainboard/samsung/lumpy/chromeos.c
@@ -47,7 +47,7 @@

/* Recovery: GPIO42 = CHP3_REC_MODE# */
    	{GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
-		 "recovery"},
+		 "presence"},

{100, ACTIVE_HIGH, lid & 1, "lid"},

diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c
index b1ad137..9ec4218 100644
--- a/src/mainboard/samsung/stumpy/chromeos.c
+++ b/src/mainboard/samsung/stumpy/chromeos.c
@@ -43,7 +43,7 @@

/* Recovery: GPIO42 = CHP3_REC_MODE# */
    	{GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
-		 "recovery"},
+		 "presence"},

/* Hard code the lid switch GPIO to open. */
    	{100, ACTIVE_HIGH, 1, "lid"},