Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc_otg_310 / usbdev_rk.h

diff --git a/drivers/usb/dwc_otg_310/usbdev_rk.h b/drivers/usb/dwc_otg_310/usbdev_rk.h
index bed18c605e887fabd4bdf9becfb350bb53f2a8a1..e5fef02622dbea87744dfe750be3f5842e4299a5 100755 (executable)
--- a/drivers/usb/dwc_otg_310/usbdev_rk.h
+++ b/drivers/usb/dwc_otg_310/usbdev_rk.h
@@ -36,6 +36,9 @@
 #define PHY_USB_MODE    (0)
 #define PHY_UART_MODE   (1)
 
+#define PHY_POWER_DOWN (0)
+#define PHY_POWER_UP   (1)
+
 #define USB_STATUS_BVABLID    (1)
 #define USB_STATUS_DPDM       (2)
 #define USB_STATUS_ID         (3)
@@ -95,6 +98,7 @@ struct dwc_otg_platform_data {
        void (*dwc_otg_uart_mode) (void *pdata, int enter_usb_uart_mode);
        void (*bc_detect_cb) (int bc_type);
        int (*get_status) (int id);
+       void (*phy_power_down)(int power_down);
 };
 
 struct rkehci_platform_data {
@@ -135,6 +139,7 @@ struct dwc_otg_control_usb {
        struct wake_lock usb_wakelock;
        int remote_wakeup;
        int usb_irq_wakeup;
+       int linestate_wakeup;
        int chip_id;
 };