summaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy/phy-fsm-usb.h
diff options
context:
space:
mode:
authorAnton Tikhomirov2013-10-03 05:42:04 +0200
committerFelipe Balbi2013-10-04 16:44:47 +0200
commit3294908bc0f178bfd67971fdb4432f3d4e50921e (patch)
tree7f62bad6292a19e459d214857933188a8053b8e8 /drivers/usb/phy/phy-fsm-usb.h
parentusb: phy: Fix OTG FSM timer handling (diff)
downloadkernel-qcow2-linux-3294908bc0f178bfd67971fdb4432f3d4e50921e.tar.gz
kernel-qcow2-linux-3294908bc0f178bfd67971fdb4432f3d4e50921e.tar.xz
kernel-qcow2-linux-3294908bc0f178bfd67971fdb4432f3d4e50921e.zip
usb: phy: Add and use missed OTG FSM timers
a_bidl_adis_tmr and a_wait_vfall_tmr OTG timers missed in current FSM implementation. This patch adds and makes use of the timers as speicfied in OTG and EH supplement to USB2.0. Signed-off-by: Anton Tikhomirov <av.tikhomirov@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/phy/phy-fsm-usb.h')
-rw-r--r--drivers/usb/phy/phy-fsm-usb.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-fsm-usb.h b/drivers/usb/phy/phy-fsm-usb.h
index b47b32c6ed1f..a74e14aaa839 100644
--- a/drivers/usb/phy/phy-fsm-usb.h
+++ b/drivers/usb/phy/phy-fsm-usb.h
@@ -35,13 +35,19 @@
#define PROTO_GADGET (2)
enum otg_fsm_timer {
+ /* Standard OTG timers */
A_WAIT_VRISE,
+ A_WAIT_VFALL,
A_WAIT_BCON,
A_AIDL_BDIS,
B_ASE0_BRST,
+ A_BIDL_ADIS,
+
+ /* Auxiliary timers */
B_SE0_SRP,
B_SRP_FAIL,
A_WAIT_ENUM,
+
NUM_OTG_FSM_TIMERS,
};
@@ -69,9 +75,11 @@ struct otg_fsm {
/* Timeout indicator for timers */
int a_wait_vrise_tmout;
+ int a_wait_vfall_tmout;
int a_wait_bcon_tmout;
int a_aidl_bdis_tmout;
int b_ase0_brst_tmout;
+ int a_bidl_adis_tmout;
/* Informative variables */
int a_bus_drop;