Merge branch develop-3.10 into develop-3.10-next

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

diff --git a/drivers/usb/dwc_otg_310/usbdev_bc.h b/drivers/usb/dwc_otg_310/usbdev_bc.h
old mode 100644 (file)
new mode 100755 (executable)
index 7e6b9bd..b4891d7
--- a/drivers/usb/dwc_otg_310/usbdev_bc.h
+++ b/drivers/usb/dwc_otg_310/usbdev_bc.h
@@ -2,32 +2,56 @@
 #define _USBDEV_BC_H
 
 /* USB Charger Types */
-#define USB_BC_TYPE_DISCNT  (0)
-#define USB_BC_TYPE_SDP     (1)
-#define USB_BC_TYPE_DCP     (2)
-#define USB_BC_TYPE_CDP     (3)
-#define USB_BC_TYPE_UNKNOW  (4)
+enum bc_port_type{
+       USB_BC_TYPE_DISCNT = 0,
+       USB_BC_TYPE_SDP,
+       USB_BC_TYPE_DCP,
+       USB_BC_TYPE_CDP,
+       USB_BC_TYPE_UNKNOW,
+       USB_BC_TYPE_MAX,
+};
+enum {
+       BC_BVALID = 0,
+       BC_IDDIG,
+};
 
 enum {
-    SYNOP_BC_BVALID = 0,
-    SYNOP_BC_DCDENB,
-    SYNOP_BC_VDATSRCENB,
-    SYNOP_BC_VDATDETENB,
-    SYNOP_BC_CHRGSEL,
-    SYNOP_BC_CHGDET,
-    SYNOP_BC_FSVPLUS,
-    SYNOP_BC_FSVMINUS,
-    SYNOP_BC_MAX,      
+       SYNOP_BC_BVALID = 0,
+       SYNOP_BC_IDDIG,
+       SYNOP_BC_DCDENB,
+       SYNOP_BC_VDATSRCENB,
+       SYNOP_BC_VDATDETENB,
+       SYNOP_BC_CHRGSEL,
+       SYNOP_BC_CHGDET,
+       SYNOP_BC_FSVPLUS,
+       SYNOP_BC_FSVMINUS,
+       SYNOP_BC_MAX,
 };
 
 enum {
-    RK_BC_BVALID = 0,
-    RK_BC_LINESTATE,
-    RK_BC_SOFTCTRL,
-    RK_BC_OPMODE,
-    RK_BC_XCVRSELECT,
-    RK_BC_TERMSELECT,
-    RK_BC_MAX,
+       INNO_BC_BVALID = 0,
+       INNO_BC_IDDIG,
+       INNO_BC_VDMSRCEN,
+       INNO_BC_VDPSRCEN,
+       INNO_BC_RDMPDEN,
+       INNO_BC_IDPSRCEN,
+       INNO_BC_IDMSINKEN,
+       INNO_BC_IDPSINKEN,
+       INNO_BC_DPATTACH,
+       INNO_BC_CPDET,
+       INNO_BC_DCPATTACH,
+       INNO_BC_MAX,
+};
+
+enum {
+       RK_BC_BVALID = 0,
+       RK_BC_IDDIG,
+       RK_BC_LINESTATE,
+       RK_BC_SOFTCTRL,
+       RK_BC_OPMODE,
+       RK_BC_XCVRSELECT,
+       RK_BC_TERMSELECT,
+       RK_BC_MAX,
 };
 
 #define T_DCD_TIMEOUT   (400)
@@ -47,9 +71,11 @@ USB Port Type
 2 : DCP - charger
 3 : CDP - pc with big currect charge
 ***********************************/
-
 extern int dwc_otg_check_dpdm(bool wait);
-extern int usb_battery_charger_detect(bool wait);
-extern void usb20otg_battery_charger_detect_cb(int charger_type_new);
+extern enum bc_port_type usb_battery_charger_detect(bool wait);
+extern void rk_battery_charger_detect_cb(int charger_type_new);
+extern int rk_bc_detect_register_notifier(struct notifier_block *nb,
+                                                 enum bc_port_type *type);
+extern int rk_bc_detect_unregister_notifier(struct notifier_block *nb);
 
 #endif