[Feature] merge MTK MR3.0 from 20220916
Change-Id: I7e07c7c1a6069994f9938d3d8a01cac6fd3bc5ae
diff --git a/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3.h b/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3.h
index 0b06a61..419648a 100644
--- a/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3.h
+++ b/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3.h
@@ -424,8 +424,8 @@
#endif
struct delayed_work forward_to_driver_work;
struct mtu3_md_sync_data *md_sync_data;
- int detect_gpio;
- int detect_irq;
+ int detect_gpio;//<maybe lynq modify? 20220916>
+ int detect_irq;//<maybe lynq modify? 20220916>
};
static inline struct mtu3 *gadget_to_mtu3(struct usb_gadget *g)
diff --git a/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_core.c b/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_core.c
index c45daca..d581ff7 100644
--- a/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_core.c
+++ b/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_core.c
@@ -330,7 +330,7 @@
{
void __iomem *mbase = mtu->mac_base;
- dev_info(mtu->dev, "%s\n", __func__);
+ dev_info(mtu->dev, "%s\n", __func__);//<maybe lynq modify? 20220916>
/* be sure interrupts are disabled before registration of ISR */
mtu3_intr_disable(mtu);
@@ -363,13 +363,13 @@
mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, LPM_HRWE);
ssusb_set_force_vbus(mtu->ssusb, true);
- mtu3_writel(mbase, U3D_POWER_MANAGEMENT, (mtu3_readl(mbase, U3D_POWER_MANAGEMENT)| LPM_MODE(1)));
- dev_info(mtu->dev, "%s, U3D_POWER_MANAGEMENT:0x%x\n", __func__, mtu3_readl(mbase, U3D_POWER_MANAGEMENT));
+ mtu3_writel(mbase, U3D_POWER_MANAGEMENT, (mtu3_readl(mbase, U3D_POWER_MANAGEMENT)| LPM_MODE(1)));//<maybe lynq modify? 20220916>
+ dev_info(mtu->dev, "%s, U3D_POWER_MANAGEMENT:0x%x\n", __func__, mtu3_readl(mbase, U3D_POWER_MANAGEMENT));//<maybe lynq modify? 20220916>
/* use new QMU format when HW version >= 0x1003 */
if (mtu->gen2cp)
mtu3_writel(mbase, U3D_QFCR, ~0x0);
}
-
+//<maybe lynq add? 20220916>
static irqreturn_t mtu3_vbus_detect_eint_isr(int irq, void *data)
{
struct ssusb_mtk *ssusb = data;//tianyan@2021.11.29 modify for usb otg
@@ -453,7 +453,7 @@
}
return 0;
}
-
+//<maybe lynq add? 20220916>
void mtu3_start(struct mtu3 *mtu)
{
void __iomem *mbase = mtu->mac_base;
diff --git a/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_host.c b/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_host.c
index 3766856..6550dda 100755
--- a/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_host.c
+++ b/src/kernel/linux/v4.19/drivers/usb/mtu3/mtu3_host.c
@@ -205,7 +205,7 @@
ssusb_set_force_mode(ssusb, MTU3_DR_FORCE_HOST);
/* if port0 supports dual-role, works as host mode by default */
- //ssusb_set_force_vbus(ssusb, false);
+ //ssusb_set_force_vbus(ssusb, false); <maybe lynq modify? 20220916>
ssusb_set_vbus(&ssusb->otg_switch, 1);
}