Change in coreboot[master]: google/cyan: Clean up write_protect_state()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59014 )

Change subject: google/cyan: Clean up write_protect_state()
......................................................................

google/cyan: Clean up write_protect_state()

The commentary was wrong, write_protect_state() is only called
in ramstage at the moment, and only if MRC_SETTINGS_PROTECT is
selected.

Implementation of get_gpio() eventually does the MMIO read, so
BOARD_GOOGLE_CYAN was not a special case.

Change-Id: I96ca871110bcf2fc1485bd042ed137d51b822a20
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/cyan/chromeos.c
1 file changed, 1 insertion(+), 31 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/59014/1

diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index c193d18..4123600 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -3,20 +3,13 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <commonlib/helpers.h>
-#include <device/mmio.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>

/* The WP status pin lives on MF_ISH_GPIO_4 */
-#define WP_STATUS_PAD_CFG0	0x4838
-#define WP_STATUS_PAD_CFG1	0x483C
-
 #define WP_GPIO			GP_E_22

-#define ACTIVE_LOW	0
-#define ACTIVE_HIGH	1
-
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
    struct lb_gpio chromeos_gpios[] = {
@@ -29,30 +22,7 @@

int get_write_protect_state(void)
 {
-	/*
-	 * The vboot loader queries this function in romstage. The GPIOs have
-	 * not been set up yet as that configuration is done in ramstage.
-	 * Configuring this GPIO as input so that there isn't any ambiguity
-	 * in the reading.
-	 */
-#if ENV_ROMSTAGE
-	if (CONFIG(BOARD_GOOGLE_CYAN)) {
-		write32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG0),
-			(PAD_PULL_UP_20K | PAD_GPIO_ENABLE | PAD_CONFIG0_GPI_DEFAULT));
-		write32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG1),
-			PAD_CONFIG1_DEFAULT0);
-	} else {
-		gpio_input_pullup(WP_GPIO);
-	}
-#endif
-
-	/* WP is enabled when the pin is reading high. */
-	if (CONFIG(BOARD_GOOGLE_CYAN)) {
-		return (read32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG0))
-			& PAD_VAL_HIGH);
-	} else {
-		return !!gpio_get(WP_GPIO);
-	}
+	return !!gpio_get(WP_GPIO);
 }

static const struct cros_gpio cros_gpios[] = {