Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc_otg_310 / usbdev_rk3126.c

diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3126.c b/drivers/usb/dwc_otg_310/usbdev_rk3126.c
index ccc817b7d25eb0301eed9a37f318ecb430d14078..a6f174cc322dbe44ac16c4c65945a120a38f4e16 100755 (executable)
--- a/drivers/usb/dwc_otg_310/usbdev_rk3126.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk3126.c
@@ -127,6 +127,9 @@ static int usb20otg_get_status(int id)
                /* id in grf */
                ret = soc_status0 & (0x1 << 8);
                break;
+       case USB_STATUS_UARTMODE:
+               ret = readl(RK_GRF_VIRT + RK312X_GRF_UOC1_CON4) & (1 << 12);
+               break;
        case USB_CHIP_ID:
                ret = control_usb->chip_id;
                break;