4 files changed, 56 insertions, 2 deletions
diff --git a/src/soc/mediatek/mt8186/Makefile.inc b/src/soc/mediatek/mt8186/Makefile.inc
index 2107ab83e2..37c1b3c9de 100644
--- a/src/soc/mediatek/mt8186/Makefile.inc
+++ b/src/soc/mediatek/mt8186/Makefile.inc
@@ -37,6 +37,7 @@ ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 ramstage-y += soc.c
 ramstage-y += ../common/timer.c timer.c
 ramstage-y += ../common/uart.c
+ramstage-y += ../common/usb.c usb.c
 ramstage-y += ../common/wdt.c wdt.c
 ramstage-y += ../common/pmic_wrap.c pmic_wrap.c mt6366.c
 
diff --git a/src/soc/mediatek/mt8186/include/soc/addressmap.h b/src/soc/mediatek/mt8186/include/soc/addressmap.h
index 28ba369474..cabafb62b3 100644
--- a/src/soc/mediatek/mt8186/include/soc/addressmap.h
+++ b/src/soc/mediatek/mt8186/include/soc/addressmap.h
@@ -64,9 +64,11 @@ enum {
 	SPI5_BASE			= IO_PHYS + 0x01015000,
 	I2C5_BASE			= IO_PHYS + 0x01016000,
 	I2C9_BASE			= IO_PHYS + 0x01019000,
-	SSUSB_IPPC_BASE			= IO_PHYS + 0x01203E00,
+	/* Corsola uses USB2 port1 instead of USB2 port0. */
+	SSUSB_IPPC_BASE			= IO_PHYS + 0x01283E00,
 	MSDC0_BASE			= IO_PHYS + 0x01230000,
-	SSUSB_SIF_BASE			= IO_PHYS + 0x01CA0000,
+	/* Corsola uses USB2 port1 instead of USB2 port0. */
+	SSUSB_SIF_BASE			= IO_PHYS + 0x01C80300,
 	EFUSEC_BASE			= IO_PHYS + 0x01CB0000,
 	MIPITX_BASE			= IO_PHYS + 0x01CC0000,
 	MSDC0_TOP_BASE			= IO_PHYS + 0x01CD0000,
diff --git a/src/soc/mediatek/mt8186/include/soc/usb.h b/src/soc/mediatek/mt8186/include/soc/usb.h
new file mode 100644
index 0000000000..297c8f186d
--- /dev/null
+++ b/src/soc/mediatek/mt8186/include/soc/usb.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+/*
+ * This file is created based on MT8186 Functional Specification
+ * Chapter number: 5.5
+ */
+
+#ifndef SOC_MEDIATEK_MT8186_USB_H
+#define SOC_MEDIATEK_MT8186_USB_H
+
+#include <soc/usb_common.h>
+
+struct ssusb_sif_port {
+	struct sif_u2_phy_com u2phy;
+	u32 reserved0[64 * 5];
+	struct sif_u3phyd u3phyd;
+	u32 reserved1[64];
+	struct sif_u3phya u3phya;
+	struct sif_u3phya_da u3phya_da;
+	u32 reserved2[64 * 3];
+};
+check_member(ssusb_sif_port, u3phyd, 0x600);
+check_member(ssusb_sif_port, u3phya, 0x800);
+check_member(ssusb_sif_port, u3phya_da, 0x900);
+check_member(ssusb_sif_port, reserved2, 0xa00);
+
+#define USB_PORT_NUMBER 1
+
+#endif
diff --git a/src/soc/mediatek/mt8186/usb.c b/src/soc/mediatek/mt8186/usb.c
new file mode 100644
index 0000000000..328dc54e8d
--- /dev/null
+++ b/src/soc/mediatek/mt8186/usb.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+/*
+ * This file is created based on MT8186 Functional Specification
+ * Chapter number: 5.5
+ */
+
+#include <device/mmio.h>
+#include <gpio.h>
+#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);
+}