ENGR00319720-2 usb: common: otg-fsm: start HNP polling timer in host state

This patch starts HNP polling timer when otg is set to be a_host
or b_host.

Signed-off-by: Li Jun <b47624@freescale.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
index f51dc5e9a23b..adea774c8cac 100644
--- a/drivers/usb/common/usb-otg-fsm.c
+++ b/drivers/usb/common/usb-otg-fsm.c
@@ -169,6 +169,7 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
                 otg_set_protocol(fsm, PROTO_HOST);
                 usb_bus_start_enum(fsm->otg->host,
                                 fsm->otg->host->otg_port);
+                otg_add_timer(fsm, HNP_POLLING);
                 break;
         case OTG_STATE_A_IDLE:
                 otg_drv_vbus(fsm, 0);
@@ -203,6 +204,7 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
                  */
                 if (!fsm->a_bus_req || fsm->a_suspend_req_inf)
                         otg_add_timer(fsm, A_WAIT_ENUM);
+                otg_add_timer(fsm, HNP_POLLING);
                 break;
         case OTG_STATE_A_SUSPEND:
                 otg_drv_vbus(fsm, 1);
diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
index b6ba1bfb86f2..1deea98838b2 100644
--- a/include/linux/usb/otg-fsm.h
+++ b/include/linux/usb/otg-fsm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007,2008 Freescale Semiconductor, Inc.
+/* Copyright (C) 2007-2014 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -53,6 +53,7 @@ enum otg_fsm_timer {
         B_SE0_SRP,
         B_SRP_FAIL,
         A_WAIT_ENUM,
+        HNP_POLLING,
 
         NUM_OTG_FSM_TIMERS,
 };