5 files changed, 34 insertions, 5 deletions

diff --git a/src/soc/mediatek/common/include/soc/usb_common.h b/src/soc/mediatek/common/include/soc/usb_common.h
index d390b70ffa..249959b910 100644
--- a/src/soc/mediatek/common/include/soc/usb_common.h
+++ b/src/soc/mediatek/common/include/soc/usb_common.h
@@ -4,6 +4,7 @@
 #define SOC_MEDIATEK_USB_COMMON_H
 
 #include <stddef.h>
+#include <stdint.h>
 
 /* ip_pw_ctrl0 */
 #define CTRL0_IP_SW_RST			(0x1 << 0)
@@ -162,5 +163,7 @@ void mtk_usb_prepare(void);
 void mtk_usb_adjust_phy_shift(void);
 
 void setup_usb_host(void);
-
+void update_usb_base_regs(uintptr_t ippc_base, uintptr_t sif_base);
+void setup_usb_secondary_host(void);
+void setup_usb_host_controller(void);
 #endif
diff --git a/src/soc/mediatek/common/usb.c b/src/soc/mediatek/common/usb.c
index b9fe83529d..cc2503b4e5 100644
--- a/src/soc/mediatek/common/usb.c
+++ b/src/soc/mediatek/common/usb.c
@@ -13,6 +13,12 @@
 static struct ssusb_ippc_regs *ippc_regs = (void *)(SSUSB_IPPC_BASE);
 static struct ssusb_sif_port *phy_ports = (void *)(SSUSB_SIF_BASE);
 
+void update_usb_base_regs(uintptr_t ippc_base, uintptr_t sif_base)
+{
+	ippc_regs = (void *)ippc_base;
+	phy_ports = (void *)sif_base;
+}
+
 static void phy_index_power_on(int index)
 {
 	struct ssusb_sif_port *phy = phy_ports + index;
@@ -150,7 +156,7 @@ __weak void mtk_usb_adjust_phy_shift(void)
 	/* do nothing */
 }
 
-void setup_usb_host(void)
+void setup_usb_host_controller(void)
 {
 	u3p_msg("Setting up USB HOST controller...\n");
 
@@ -164,3 +170,9 @@ void setup_usb_host(void)
 	mtk_usb_adjust_phy_shift();
 	u3p_msg("phy power-on done.\n");
 }
+
+void setup_usb_host(void)
+{
+	update_usb_base_regs(SSUSB_IPPC_BASE, SSUSB_SIF_BASE);
+	setup_usb_host_controller();
+}
diff --git a/src/soc/mediatek/common/usb_secondary.c b/src/soc/mediatek/common/usb_secondary.c
new file mode 100644
index 0000000000..ee85630250
--- /dev/null
+++ b/src/soc/mediatek/common/usb_secondary.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <soc/addressmap.h>
+#include <soc/usb.h>
+
+void setup_usb_secondary_host(void)
+{
+	/* We always consider USB2 port as the secondary UBS host regardless of the
+	   register naming */
+	update_usb_base_regs(SSUSB_IPPC_BASE_P0, SSUSB_SIF_BASE_P0);
+	setup_usb_host_controller();
+}
diff --git a/src/soc/mediatek/mt8186/Makefile.mk b/src/soc/mediatek/mt8186/Makefile.mk
index 3a3cc07ce6..8e116f82e6 100644
--- a/src/soc/mediatek/mt8186/Makefile.mk
+++ b/src/soc/mediatek/mt8186/Makefile.mk
@@ -51,7 +51,7 @@ ramstage-y += soc.c
 ramstage-y += ../common/spm.c spm.c
 ramstage-y += ../common/sspm.c
 ramstage-y += ../common/tps65132s.c
-ramstage-y += ../common/usb.c usb.c
+ramstage-y += ../common/usb.c ../common/usb_secondary.c usb.c
 
 CPPFLAGS_common += -Isrc/soc/mediatek/mt8186/include
 CPPFLAGS_common += -Isrc/soc/mediatek/common/dp/include
diff --git a/src/soc/mediatek/mt8186/include/soc/addressmap.h b/src/soc/mediatek/mt8186/include/soc/addressmap.h
index 5f0b10c5e0..64500aaad0 100644
--- a/src/soc/mediatek/mt8186/include/soc/addressmap.h
+++ b/src/soc/mediatek/mt8186/include/soc/addressmap.h
@@ -76,11 +76,13 @@ enum {
 	SPI5_BASE			= IO_PHYS + 0x01015000,
 	I2C5_BASE			= IO_PHYS + 0x01016000,
 	I2C9_BASE			= IO_PHYS + 0x01019000,
-	/* Corsola uses USB2 port1 instead of USB2 port0. */
+	/* IPPC_BASE is for USB2 port1, IPPC_BASE_P0 is for USB2 port0 */
+	SSUSB_IPPC_BASE_P0		= IO_PHYS + 0x01203E00,
 	SSUSB_IPPC_BASE			= IO_PHYS + 0x01283E00,
 	MSDC0_BASE			= IO_PHYS + 0x01230000,
-	/* Corsola uses USB2 port1 instead of USB2 port0. */
+	/* SIF_BASE is for USB2 port1, SIF_BASE_P0 is for USB2 port0 */
 	SSUSB_SIF_BASE			= IO_PHYS + 0x01C80300,
+	SSUSB_SIF_BASE_P0		= IO_PHYS + 0x01CA0300,
 	EFUSEC_BASE			= IO_PHYS + 0x01CB0000,
 	MIPITX_BASE			= IO_PHYS + 0x01CC0000,
 	MSDC0_TOP_BASE			= IO_PHYS + 0x01CD0000,