From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 10 Jul 2014 01:22:27 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
X-Git-Tag: firefly_0821_release~4916^2~278
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77ddfc9d50214cb453dc280580419fc551e77ffe;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	drivers/usb/dwc_otg_310/usbdev_rk.h
---

77ddfc9d50214cb453dc280580419fc551e77ffe
diff --cc drivers/usb/dwc_otg_310/usbdev_rk.h
index 8f4389e10a85,0c6e48a57d98..c6d9e76d2694
--- a/drivers/usb/dwc_otg_310/usbdev_rk.h
+++ b/drivers/usb/dwc_otg_310/usbdev_rk.h
@@@ -41,9 -41,13 +42,16 @@@
  #define USB_REMOTE_WAKEUP     (6)
  #define USB_IRQ_WAKEUP        (7)
  
 +#define UOC_HIWORD_UPDATE(val, mask, shift) \
 +		((val) << (shift) | (mask) << ((shift) + 16))
 +
+ enum rkusb_rst_flag {
+ 	RST_POR = 0, /* Reset power-on */
+ 	RST_RECNT,	/* Reset re-connect */
+ 	RST_CHN_HALT, /* Reset a channel halt has been detected */
+ 	RST_OTHER,
+ };
+ 
  extern int rk_usb_charger_status;
  extern void rk_send_wakeup_key(void);
  /* rk3188 platform data */