From e5af0d9dccdc919d775876aa7f8f358d303f7ae0 Mon Sep 17 00:00:00 2001 From: Venu Byravarasu Date: Thu, 6 Sep 2012 10:42:15 +0530 Subject: [PATCH] --- yaml --- r: 325941 b: refs/heads/master c: a4c3ddec5c5293953d8472eb151c48a3205b738b h: refs/heads/master i: 325939: fd050f19ace02c6ecf5471303f3798c0dbba7431 v: v3 --- [refs] | 2 +- trunk/include/linux/usb/otg.h | 24 ------------------------ trunk/include/linux/usb/phy.h | 25 +++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 326231a31c01..05121bef47bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ba8216f0bc02af6ba70d1108d60eb1b064395e4 +refs/heads/master: a4c3ddec5c5293953d8472eb151c48a3205b738b diff --git a/trunk/include/linux/usb/otg.h b/trunk/include/linux/usb/otg.h index 65a2b6afe020..e8a5fe87c6bd 100644 --- a/trunk/include/linux/usb/otg.h +++ b/trunk/include/linux/usb/otg.h @@ -11,30 +11,6 @@ #include -/* OTG defines lots of enumeration states before device reset */ -enum usb_otg_state { - OTG_STATE_UNDEFINED = 0, - - /* single-role peripheral, and dual-role default-b */ - OTG_STATE_B_IDLE, - OTG_STATE_B_SRP_INIT, - OTG_STATE_B_PERIPHERAL, - - /* extra dual-role default-b states */ - OTG_STATE_B_WAIT_ACON, - OTG_STATE_B_HOST, - - /* dual-role default-a */ - OTG_STATE_A_IDLE, - OTG_STATE_A_WAIT_VRISE, - OTG_STATE_A_WAIT_BCON, - OTG_STATE_A_HOST, - OTG_STATE_A_SUSPEND, - OTG_STATE_A_PERIPHERAL, - OTG_STATE_A_WAIT_VFALL, - OTG_STATE_A_VBUS_ERR, -}; - struct usb_otg { u8 default_a; diff --git a/trunk/include/linux/usb/phy.h b/trunk/include/linux/usb/phy.h index 88fc16062e77..06b5bae35b29 100644 --- a/trunk/include/linux/usb/phy.h +++ b/trunk/include/linux/usb/phy.h @@ -26,6 +26,30 @@ enum usb_phy_type { USB_PHY_TYPE_USB3, }; +/* OTG defines lots of enumeration states before device reset */ +enum usb_otg_state { + OTG_STATE_UNDEFINED = 0, + + /* single-role peripheral, and dual-role default-b */ + OTG_STATE_B_IDLE, + OTG_STATE_B_SRP_INIT, + OTG_STATE_B_PERIPHERAL, + + /* extra dual-role default-b states */ + OTG_STATE_B_WAIT_ACON, + OTG_STATE_B_HOST, + + /* dual-role default-a */ + OTG_STATE_A_IDLE, + OTG_STATE_A_WAIT_VRISE, + OTG_STATE_A_WAIT_BCON, + OTG_STATE_A_HOST, + OTG_STATE_A_SUSPEND, + OTG_STATE_A_PERIPHERAL, + OTG_STATE_A_WAIT_VFALL, + OTG_STATE_A_VBUS_ERR, +}; + struct usb_phy; struct usb_otg; @@ -43,6 +67,7 @@ struct usb_phy { unsigned int flags; enum usb_phy_type type; + enum usb_otg_state state; enum usb_phy_events last_event; struct usb_otg *otg;