aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Tikhomirov <av.tikhomirov@samsung.com>2013-11-25 21:47:02 -0500
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 12:02:28 -0400
commit3a4c75accd80554ff65b87e1d50be4442f20eef8 (patch)
tree896c2133124df0681d0839c64690fb2f0417a26d
parent77ad4a580d30d5f623cbe4b4dafc0d505dd8b723 (diff)
usb: phy: move OTG FSM header
Other USB drivers may want to use OTG final state machine implementation, so make this header available for them. Signed-off-by: Anton Tikhomirov <av.tikhomirov@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com> (cherry-picked from commit 5653668c9585441926dd2575791f6b5bb84bb254)
-rw-r--r--drivers/usb/phy/phy-fsl-usb.h2
-rw-r--r--drivers/usb/phy/phy-fsm-usb.c3
-rw-r--r--include/linux/usb/otg-fsm.h (renamed from drivers/usb/phy/phy-fsm-usb.h)0
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index 7365170a2f23..5986c96354df 100644
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -15,7 +15,7 @@
15 * 675 Mass Ave, Cambridge, MA 02139, USA. 15 * 675 Mass Ave, Cambridge, MA 02139, USA.
16 */ 16 */
17 17
18#include "phy-fsm-usb.h" 18#include <linux/usb/otg-fsm.h>
19#include <linux/usb/otg.h> 19#include <linux/usb/otg.h>
20#include <linux/ioctl.h> 20#include <linux/ioctl.h>
21 21
diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c
index 2817b04a6c47..62238726fb1c 100644
--- a/drivers/usb/phy/phy-fsm-usb.c
+++ b/drivers/usb/phy/phy-fsm-usb.c
@@ -28,8 +28,7 @@
28#include <linux/usb.h> 28#include <linux/usb.h>
29#include <linux/usb/gadget.h> 29#include <linux/usb/gadget.h>
30#include <linux/usb/otg.h> 30#include <linux/usb/otg.h>
31 31#include <linux/usb/otg-fsm.h>
32#include "phy-fsm-usb.h"
33 32
34/* Change USB protocol when there is a protocol change */ 33/* Change USB protocol when there is a protocol change */
35static int otg_set_protocol(struct otg_fsm *fsm, int protocol) 34static int otg_set_protocol(struct otg_fsm *fsm, int protocol)
diff --git a/drivers/usb/phy/phy-fsm-usb.h b/include/linux/usb/otg-fsm.h
index b6ba1bfb86f2..b6ba1bfb86f2 100644
--- a/drivers/usb/phy/phy-fsm-usb.h
+++ b/include/linux/usb/otg-fsm.h