diff --git a/src/mainboard/google/kirby/chromeos.c b/src/mainboard/google/kirby/chromeos.c
index dc1527009d..b7af5c9ce5 100644
--- a/src/mainboard/google/kirby/chromeos.c
+++ b/src/mainboard/google/kirby/chromeos.c
@@ -101,5 +101,5 @@ int get_recovery_mode_switch(void)
 
 int get_write_protect_state(void)
 {
-	return 0; // FIXME what GPIO? // WP hard coded to disabled
+	return !gpio_get_value(GPIO_X30);
 }
diff --git a/src/mainboard/google/pit/chromeos.c b/src/mainboard/google/pit/chromeos.c
index dc1527009d..b7af5c9ce5 100644
--- a/src/mainboard/google/pit/chromeos.c
+++ b/src/mainboard/google/pit/chromeos.c
@@ -101,5 +101,5 @@ int get_recovery_mode_switch(void)
 
 int get_write_protect_state(void)
 {
-	return 0; // FIXME what GPIO? // WP hard coded to disabled
+	return !gpio_get_value(GPIO_X30);
 }
diff --git a/src/mainboard/google/snow/chromeos.c b/src/mainboard/google/snow/chromeos.c
index 2b830a12ff..94cf6152d7 100644
--- a/src/mainboard/google/snow/chromeos.c
+++ b/src/mainboard/google/snow/chromeos.c
@@ -99,7 +99,7 @@ int get_recovery_mode_switch(void)
 		  EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
 }
 
-int get_recovery_mode_from_vbnv(void)
+int get_write_protect_state(void)
 {
-	return 0;
+	return !gpio_get_value(GPIO_D16);
 }