summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex-BC Chen <rex-bc.chen@mediatek.corp-partner.google.com>2021-12-13 19:43:17 +0800
committerHung-Te Lin <hungte@chromium.org>2021-12-15 07:52:34 +0000
commitadd2e930505be3470092774f595cdb8b3ff61ef2 (patch)
tree65e725d6581117181127d32f109fd19f8f6b5f9a
parent0fd072d3f2a3360d73ec7b5b11a06b52025b17ea (diff)
mb/google/corsola: move USB3 HUB reset funtion to bootblock
To save the S3 power, USB3_HUB_RST_L is externally pulled up to a weak resistor, so we have to reset the hub as early as possible. Otherwise the USB3 hub may be not usable. Therefore, move USB3 HUB reset function to bootblock. BUG=b:210065282 TEST=build pass Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com> Change-Id: I92feb2316302fda32478b24c014bcd380d0ac55d Reviewed-on: https://review.coreboot.org/c/coreboot/+/60088 Reviewed-by: Yu-Ping Wu <yupingso@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/corsola/bootblock.c7
-rw-r--r--src/mainboard/google/corsola/gpio.h1
-rw-r--r--src/soc/mediatek/mt8186/usb.c6
3 files changed, 8 insertions, 6 deletions
diff --git a/src/mainboard/google/corsola/bootblock.c b/src/mainboard/google/corsola/bootblock.c
index 71f1d3687d..87b972d59c 100644
--- a/src/mainboard/google/corsola/bootblock.c
+++ b/src/mainboard/google/corsola/bootblock.c
@@ -2,10 +2,16 @@
#include <bootblock_common.h>
#include <device/mmio.h>
+#include <gpio.h>
#include <soc/spi.h>
#include "gpio.h"
+static void usb3_hub_reset(void)
+{
+ gpio_output(GPIO_USB3_HUB_RST_L, 1);
+}
+
void bootblock_mainboard_init(void)
{
mtk_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, SPI_PAD0_MASK, 3 * MHz, 0);
@@ -13,4 +19,5 @@ void bootblock_mainboard_init(void)
mtk_snfc_init(SPI_NOR_GPIO_SET1);
setup_chromeos_gpios();
gpio_eint_configure(GPIO_GSC_AP_INT_ODL, IRQ_TYPE_EDGE_RISING);
+ usb3_hub_reset();
}
diff --git a/src/mainboard/google/corsola/gpio.h b/src/mainboard/google/corsola/gpio.h
index 2c785645de..c2f789eae1 100644
--- a/src/mainboard/google/corsola/gpio.h
+++ b/src/mainboard/google/corsola/gpio.h
@@ -23,6 +23,7 @@
#define GPIO_RESET GPIO(PERIPHERAL_EN0)
#define GPIO_XHCI_DONE GPIO(PERIPHERAL_EN1)
+#define GPIO_USB3_HUB_RST_L GPIO(PERIPHERAL_EN2)
#define GPIO_EN_SPK GPIO(PERIPHERAL_EN3)
#define GPIO_BEEP_ON GPIO(PERIPHERAL_EN4)
diff --git a/src/soc/mediatek/mt8186/usb.c b/src/soc/mediatek/mt8186/usb.c
index 328dc54e8d..6d83abbde1 100644
--- a/src/soc/mediatek/mt8186/usb.c
+++ b/src/soc/mediatek/mt8186/usb.c
@@ -10,13 +10,7 @@
#include <soc/gpio.h>
#include <soc/usb.h>
-static void usb3_hub_reset(void)
-{
- gpio_output(GPIO(PERIPHERAL_EN2), 1);
-}
-
void mtk_usb_prepare(void)
{
- usb3_hub_reset();
gpio_output(GPIO(USB_DRVVBUS_P1), 1);
}