hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/usb/chipidea/usbmisc_imx.c
....@@ -135,7 +135,7 @@
135135 #define TXVREFTUNE0_MASK (0xf << 20)
136136
137137 #define MX6_USB_OTG_WAKEUP_BITS (MX6_BM_WAKEUP_ENABLE | MX6_BM_VBUS_WAKEUP | \
138
- MX6_BM_ID_WAKEUP)
138
+ MX6_BM_ID_WAKEUP | MX6SX_BM_DPDM_WAKEUP_EN)
139139
140140 struct usbmisc_ops {
141141 /* It's called once when probe a usb device */
....@@ -657,13 +657,15 @@
657657 usbmisc->base + MX7D_USBNC_USB_CTRL2);
658658 /* PHY tuning for signal quality */
659659 reg = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG1);
660
- if (data->emp_curr_control && data->emp_curr_control <=
660
+ if (data->emp_curr_control >= 0 &&
661
+ data->emp_curr_control <=
661662 (TXPREEMPAMPTUNE0_MASK >> TXPREEMPAMPTUNE0_BIT)) {
662663 reg &= ~TXPREEMPAMPTUNE0_MASK;
663664 reg |= (data->emp_curr_control << TXPREEMPAMPTUNE0_BIT);
664665 }
665666
666
- if (data->dc_vol_level_adjust && data->dc_vol_level_adjust <=
667
+ if (data->dc_vol_level_adjust >= 0 &&
668
+ data->dc_vol_level_adjust <=
667669 (TXVREFTUNE0_MASK >> TXVREFTUNE0_BIT)) {
668670 reg &= ~TXVREFTUNE0_MASK;
669671 reg |= (data->dc_vol_level_adjust << TXVREFTUNE0_BIT);