4 files changed, 6 insertions, 8 deletions

diff --git a/src/mainboard/google/rush_ryu/boardid.c b/src/mainboard/google/rush_ryu/boardid.c
index 9d99b90ddc..ba3a4be9e9 100644
--- a/src/mainboard/google/rush_ryu/boardid.c
+++ b/src/mainboard/google/rush_ryu/boardid.c
@@ -19,7 +19,6 @@
 
 #include <boardid.h>
 #include <console/console.h>
-#include <soc/gpio.h>
 #include <stdlib.h>
 
 #include "gpio.h"
@@ -75,8 +74,7 @@ uint8_t board_id(void)
 		int tristate_id;
 		gpio_t gpio[] = { BD_ID0, BD_ID1 };
 
-		tristate_id = gpio_get_in_tristate_values(gpio,
-							ARRAY_SIZE(gpio), 0);
+		tristate_id = gpio_get_tristates(gpio, ARRAY_SIZE(gpio), 0);
 
 		for (i = 0; i < ARRAY_SIZE(bdid_map); i++) {
 			if (tristate_id != bdid_map[i].tri_state_value)
diff --git a/src/mainboard/google/rush_ryu/chromeos.c b/src/mainboard/google/rush_ryu/chromeos.c
index 521fe59372..f752aeee6c 100644
--- a/src/mainboard/google/rush_ryu/chromeos.c
+++ b/src/mainboard/google/rush_ryu/chromeos.c
@@ -33,7 +33,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Write Protect: active low */
 	gpios->gpios[count].port = WRITE_PROTECT_L_INDEX;
 	gpios->gpios[count].polarity = ACTIVE_LOW;
-	gpios->gpios[count].value = gpio_get_in_value(WRITE_PROTECT_L);
+	gpios->gpios[count].value = gpio_get(WRITE_PROTECT_L);
 	strncpy((char *)gpios->gpios[count].name, "write protect",
 		GPIO_MAX_NAME_LENGTH);
 	count++;
@@ -51,7 +51,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Power: active low */
 	gpios->gpios[count].port = POWER_BUTTON_INDEX,
 	gpios->gpios[count].polarity = ACTIVE_HIGH;
-	gpios->gpios[count].value = gpio_get_in_value(POWER_BUTTON);
+	gpios->gpios[count].value = gpio_get(POWER_BUTTON);
 	strncpy((char *)gpios->gpios[count].name, "power",
 		GPIO_MAX_NAME_LENGTH);
 	count++;
@@ -86,5 +86,5 @@ int get_recovery_mode_switch(void)
 
 int get_write_protect_state(void)
 {
-	return !gpio_get_in_value(WRITE_PROTECT_L);
+	return !gpio_get(WRITE_PROTECT_L);
 }
diff --git a/src/mainboard/google/rush_ryu/gpio.h b/src/mainboard/google/rush_ryu/gpio.h
index 9c67420ff0..2792ec389f 100644
--- a/src/mainboard/google/rush_ryu/gpio.h
+++ b/src/mainboard/google/rush_ryu/gpio.h
@@ -20,7 +20,7 @@
 #ifndef __MAINBOARD_GOOGLE_RUSH_RYU_GPIO_H__
 #define __MAINBOARD_GOOGLE_RUSH_RYU_GPIO_H__
 
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* Board ID definitions. */
 enum {
diff --git a/src/mainboard/google/rush_ryu/romstage.c b/src/mainboard/google/rush_ryu/romstage.c
index 41c9149be4..fc2379f9b3 100644
--- a/src/mainboard/google/rush_ryu/romstage.c
+++ b/src/mainboard/google/rush_ryu/romstage.c
@@ -69,7 +69,7 @@ static void lte_modem_init(void)
 	int mdm_det;
 
 	/* A LTE modem is present if MDM_DET is pulled down by the modem */
-	mdm_det = gpio_get_in_value(MDM_DET);
+	mdm_det = gpio_get(MDM_DET);
 	if (mdm_det == 1)
 		return;