This patch adds host request flag in usb_gadget and clears it when leaves host state in OTG fsm driver, which will be set in gadget driver if the peripheral wishes to become host.
Signed-off-by: Li Jun <[email protected]> --- drivers/usb/phy/phy-fsm-usb.c | 4 ++++ include/linux/usb/gadget.h | 1 + include/linux/usb/otg-fsm.h | 7 +++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c index ef91961..293f35f 100644 --- a/drivers/usb/phy/phy-fsm-usb.c +++ b/drivers/usb/phy/phy-fsm-usb.c @@ -84,6 +84,8 @@ static void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state) fsm->b_ase0_brst_tmout = 0; break; case OTG_STATE_B_HOST: + if (fsm->otg->gadget) + fsm->otg->gadget->host_request_flag = 0; break; case OTG_STATE_A_IDLE: fsm->adp_prb = 0; @@ -98,6 +100,8 @@ static void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state) break; case OTG_STATE_A_HOST: otg_del_timer(fsm, A_WAIT_ENUM); + if (fsm->otg->gadget) + fsm->otg->gadget->host_request_flag = 0; break; case OTG_STATE_A_SUSPEND: otg_del_timer(fsm, A_AIDL_BDIS); diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index c3a6185..3b17e99 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -562,6 +562,7 @@ struct usb_gadget { unsigned b_hnp_enable:1; unsigned a_hnp_support:1; unsigned a_alt_hnp_support:1; + unsigned host_request_flag:1; unsigned quirk_ep_out_aligned_size:1; }; #define work_to_gadget(w) (container_of((w), struct usb_gadget, work)) diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h index 79c6ee8..c38616e 100644 --- a/include/linux/usb/otg-fsm.h +++ b/include/linux/usb/otg-fsm.h @@ -40,6 +40,13 @@ #define PROTO_HOST (1) #define PROTO_GADGET (2) +#define OTG_STS_SELECTOR 0xF000 /* OTG status selector, according to + * OTG and EH 2.0 Charpter 6.2.3 + * Table:6-4 */ +#define HOST_REQUEST_FLAG 1 /* Host request flag, according to + * OTG and EH 2.0 Charpter 6.2.3 + * Table:6-5 */ + enum otg_fsm_timer { /* Standard OTG timers */ A_WAIT_VRISE, -- 1.7.8 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
