6 files changed, 18 insertions, 18 deletions

diff --git a/src/mainboard/google/veyron_pinky/board.h b/src/mainboard/google/veyron_pinky/board.h
index 8d452c8a89..73eb5efc44 100644
--- a/src/mainboard/google/veyron_pinky/board.h
+++ b/src/mainboard/google/veyron_pinky/board.h
@@ -21,7 +21,7 @@
 #define __MAINBOARD_GOOGLE_VEYRON_PINKY_BOARD_H
 
 #include <boardid.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 #define PMIC_BUS 0
 
diff --git a/src/mainboard/google/veyron_pinky/boardid.c b/src/mainboard/google/veyron_pinky/boardid.c
index 01e92a3d32..d8f4a3d7f7 100644
--- a/src/mainboard/google/veyron_pinky/boardid.c
+++ b/src/mainboard/google/veyron_pinky/boardid.c
@@ -19,7 +19,7 @@
 
 #include <boardid.h>
 #include <console/console.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <stdlib.h>
 
 uint8_t board_id(void)
@@ -38,7 +38,7 @@ uint8_t board_id(void)
 		id = 0;
 		for (i = 0; i < ARRAY_SIZE(pins); i++) {
 			gpio_input(pins[i]);
-			id |= gpio_get_in_value(pins[i]) << i;
+			id |= gpio_get(pins[i]) << i;
 		}
 		printk(BIOS_SPEW, "Board ID: %#x.\n", id);
 	}
diff --git a/src/mainboard/google/veyron_pinky/chromeos.c b/src/mainboard/google/veyron_pinky/chromeos.c
index 30cd277623..dc224a5a2f 100644
--- a/src/mainboard/google/veyron_pinky/chromeos.c
+++ b/src/mainboard/google/veyron_pinky/chromeos.c
@@ -21,7 +21,7 @@
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
@@ -47,7 +47,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Write Protect: active low */
 	gpios->gpios[count].port = GPIO_WP.raw;
 	gpios->gpios[count].polarity = ACTIVE_LOW;
-	gpios->gpios[count].value = gpio_get_in_value(GPIO_WP);
+	gpios->gpios[count].value = gpio_get(GPIO_WP);
 	strncpy((char *)gpios->gpios[count].name, "write protect",
 		GPIO_MAX_NAME_LENGTH);
 	count++;
@@ -63,14 +63,14 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	/* Lid: active high */
 	gpios->gpios[count].port = GPIO_LID.raw;
 	gpios->gpios[count].polarity = ACTIVE_HIGH;
-	gpios->gpios[count].value = gpio_get_in_value(GPIO_LID);
+	gpios->gpios[count].value = gpio_get(GPIO_LID);
 	strncpy((char *)gpios->gpios[count].name, "lid", GPIO_MAX_NAME_LENGTH);
 	count++;
 
 	/* Power:GPIO active high */
 	gpios->gpios[count].port = GPIO_POWER.raw;
 	gpios->gpios[count].polarity = ACTIVE_HIGH;
-	gpios->gpios[count].value = gpio_get_in_value(GPIO_POWER);
+	gpios->gpios[count].value = gpio_get(GPIO_POWER);
 	strncpy((char *)gpios->gpios[count].name, "power",
 		GPIO_MAX_NAME_LENGTH);
 	count++;
@@ -99,7 +99,7 @@ int get_recovery_mode_switch(void)
 	uint32_t ec_events;
 
 	/* The GPIO is active low. */
-	if (!gpio_get_in_value(GPIO_RECOVERY))
+	if (!gpio_get(GPIO_RECOVERY))
 		return 1;
 
 	ec_events = google_chromeec_get_events_b();
@@ -109,6 +109,6 @@ int get_recovery_mode_switch(void)
 
 int get_write_protect_state(void)
 {
-	return !gpio_get_in_value(GPIO_WP);
+	return !gpio_get(GPIO_WP);
 }
 
diff --git a/src/mainboard/google/veyron_pinky/mainboard.c b/src/mainboard/google/veyron_pinky/mainboard.c
index a8cc3c3aa4..2442472b67 100644
--- a/src/mainboard/google/veyron_pinky/mainboard.c
+++ b/src/mainboard/google/veyron_pinky/mainboard.c
@@ -19,13 +19,13 @@
 
 #include <arch/cache.h>
 #include <arch/io.h>
+#include <boot/coreboot_tables.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
-#include <edid.h>
-#include <boot/coreboot_tables.h>
 #include <device/i2c.h>
-#include <soc/gpio.h>
+#include <edid.h>
+#include <gpio.h>
 #include <soc/grf.h>
 #include <soc/soc.h>
 #include <soc/pmu.h>
diff --git a/src/mainboard/google/veyron_pinky/reset.c b/src/mainboard/google/veyron_pinky/reset.c
index a2777f86d6..9cbe9c1551 100644
--- a/src/mainboard/google/veyron_pinky/reset.c
+++ b/src/mainboard/google/veyron_pinky/reset.c
@@ -18,7 +18,7 @@
  */
 
 #include <arch/io.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <reset.h>
 
 #include "board.h"
diff --git a/src/mainboard/google/veyron_pinky/sdram_configs.c b/src/mainboard/google/veyron_pinky/sdram_configs.c
index 1a331cebef..a58c6dd3d3 100644
--- a/src/mainboard/google/veyron_pinky/sdram_configs.c
+++ b/src/mainboard/google/veyron_pinky/sdram_configs.c
@@ -18,8 +18,8 @@
  */
 #include <arch/io.h>
 #include <console/console.h>
+#include <gpio.h>
 #include <soc/sdram.h>
-#include <soc/gpio.h>
 #include <string.h>
 #include <types.h>
 
@@ -56,10 +56,10 @@ u32 sdram_get_ram_code(void)
 	gpio_input(GPIO_RAMCODE2);
 	gpio_input(GPIO_RAMCODE3);
 
-	code = gpio_get_in_value(GPIO_RAMCODE3) << 3
-			| gpio_get_in_value(GPIO_RAMCODE2) << 2
-			| gpio_get_in_value(GPIO_RAMCODE1) << 1
-			| gpio_get_in_value(GPIO_RAMCODE0) << 0;
+	code = gpio_get(GPIO_RAMCODE3) << 3
+			| gpio_get(GPIO_RAMCODE2) << 2
+			| gpio_get(GPIO_RAMCODE1) << 1
+			| gpio_get(GPIO_RAMCODE0) << 0;
 
 	return code;
 }