4 files changed, 26 insertions, 16 deletions

diff --git a/src/mainboard/google/pit/devicetree.cb b/src/mainboard/google/pit/devicetree.cb
index 0c687c41c3..3b6cdb9014 100644
--- a/src/mainboard/google/pit/devicetree.cb
+++ b/src/mainboard/google/pit/devicetree.cb
@@ -30,6 +30,4 @@ chip cpu/samsung/exynos5420
 	register "left_margin" = "80"
 	register "right_margin" = "48"
 	register "hsync" = "32"
-	register "usb_vbus_gpio" = "GPIO_X11"
-	register "usb_hsic_gpio" = "GPIO_E10"
 end
diff --git a/src/mainboard/google/pit/mainboard.c b/src/mainboard/google/pit/mainboard.c
index 9aa8d5cd30..77c54a189f 100644
--- a/src/mainboard/google/pit/mainboard.c
+++ b/src/mainboard/google/pit/mainboard.c
@@ -36,6 +36,7 @@
 #include <cpu/samsung/exynos5420/i2c.h>
 #include <cpu/samsung/exynos5420/dp.h>
 #include <cpu/samsung/exynos5420/fimd.h>
+#include <cpu/samsung/exynos5420/usb.h>
 #include <drivers/parade/ps8625/ps8625.h>
 #include <ec/google/chromeec/ec.h>
 #include <stdlib.h>
@@ -303,7 +304,16 @@ static void backlight_en(void)
 	gpio_direction_output(bl_en, 1);
 }
 
+static enum exynos5_gpio_pin usb_drd0_vbus = GPIO_H00;
+static enum exynos5_gpio_pin usb_drd1_vbus = GPIO_H01;
+/* static enum exynos5_gpio_pin hsic_reset_l = GPIO_X24; */
 
+static void setup_usb(void)
+{
+	/* HSIC and USB HOST port not needed in firmware on this board */
+	gpio_direction_output(usb_drd0_vbus, 1);
+	gpio_direction_output(usb_drd1_vbus, 1);
+}
 
 static struct edp_video_info dp_video_info = {
 	.master_mode = 0,
@@ -320,16 +330,6 @@ static struct edp_video_info dp_video_info = {
 #define EXYNOS5420_DP1_BASE	0x145b0000
 #define MAX_DP_TRIES	5
 
-/*
- * This function disables the USB3.0 PLL to save power
- */
-static void disable_usb30_pll(void)
-{
-	enum exynos5_gpio_pin usb3_pll_l = GPIO_Y11;
-
-	gpio_direction_output(usb3_pll_l, 0);
-}
-
 static void setup_storage(void)
 {
 	/* MMC0: Fixed, 8 bit mode, connected with GPIO. */
@@ -405,8 +405,7 @@ static void mainboard_init(device_t dev)
 	/* Clock Gating all the unused IP's to save power */
 	clock_gate();
 
-	/* Disable USB3.0 PLL to save 250mW of power */
-	disable_usb30_pll();
+	setup_usb();
 
 	sdmmc_vdd();
 
diff --git a/src/mainboard/google/snow/devicetree.cb b/src/mainboard/google/snow/devicetree.cb
index 34aa4e6e87..c14f374d6d 100644
--- a/src/mainboard/google/snow/devicetree.cb
+++ b/src/mainboard/google/snow/devicetree.cb
@@ -30,6 +30,4 @@ chip cpu/samsung/exynos5250
 	register "left_margin" = "80"
 	register "right_margin" = "48"
 	register "hsync" = "32"
-	register "usb_vbus_gpio" = "GPIO_X11"
-	register "usb_hsic_gpio" = "GPIO_E10"
 end
diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c
index 9fc2fe6d26..d209a762fc 100644
--- a/src/mainboard/google/snow/mainboard.c
+++ b/src/mainboard/google/snow/mainboard.c
@@ -35,6 +35,7 @@
 #include <cpu/samsung/exynos5250/power.h>
 #include <cpu/samsung/exynos5250/i2c.h>
 #include <cpu/samsung/exynos5250/dp-core.h>
+#include <cpu/samsung/exynos5250/usb.h>
 
 #include "exynos5250.h"
 
@@ -156,6 +157,19 @@ static void sdmmc_vdd(void)
 	tps65090_fet_enable(TPS65090_BUS, FET4_CTRL);
 }
 
+static enum exynos5_gpio_pin usb_host_vbus = GPIO_X11;
+static enum exynos5_gpio_pin usb_drd_vbus = GPIO_X27;
+/* static enum exynos5_gpio_pin hsic_reset_l = GPIO_E10; */
+
+static void setup_usb(void)
+{
+	/* HSIC not needed in firmware on this board */
+	setup_usb_host_phy(0);
+
+	gpio_direction_output(usb_host_vbus, 1);
+	gpio_direction_output(usb_drd_vbus, 1);
+}
+
 //static struct video_info smdk5250_dp_config = {
 static struct video_info dp_video_info = {
 	/* FIXME: fix video_info struct to use const for name */
@@ -256,6 +270,7 @@ static void mainboard_init(device_t dev)
 
 	/* Disable USB3.0 PLL to save 250mW of power */
 	disable_usb30_pll();
+	setup_usb();
 
 	sdmmc_vdd();