diff options
author | Anton Tikhomirov <av.tikhomirov@samsung.com> | 2013-10-02 23:42:04 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 12:02:25 -0400 |
commit | 88c1ff95d72ef41e735e872a4117c1dfd01e4bfa (patch) | |
tree | 326b2c28c3aecb19406629c0a6cd49712a7263ca | |
parent | 35c10a126c1070edbba31258ac89cac34c7c8e0e (diff) |
usb: phy: Rename "B-device session end SRP" OTG FSM input
In accordance with OTG and EH supplement, the correct name
of the FSM input is b_ssend_srp.
Signed-off-by: Anton Tikhomirov <av.tikhomirov@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
(cherry-picked from commit 68041785d0c69884c4adb3bcab48f92ac3e75629)
-rw-r--r-- | drivers/usb/phy/phy-fsl-usb.c | 4 | ||||
-rw-r--r-- | drivers/usb/phy/phy-fsm-usb.c | 2 | ||||
-rw-r--r-- | drivers/usb/phy/phy-fsm-usb.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index 829996cbdee9..d58a510d0287 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c | |||
@@ -1067,7 +1067,7 @@ static int show_fsl_usb2_otg_state(struct device *dev, | |||
1067 | "b_bus_suspend: %d\n" | 1067 | "b_bus_suspend: %d\n" |
1068 | "b_conn: %d\n" | 1068 | "b_conn: %d\n" |
1069 | "b_se0_srp: %d\n" | 1069 | "b_se0_srp: %d\n" |
1070 | "b_sess_end: %d\n" | 1070 | "b_ssend_srp: %d\n" |
1071 | "b_sess_vld: %d\n" | 1071 | "b_sess_vld: %d\n" |
1072 | "id: %d\n", | 1072 | "id: %d\n", |
1073 | fsm->a_bus_req, | 1073 | fsm->a_bus_req, |
@@ -1082,7 +1082,7 @@ static int show_fsl_usb2_otg_state(struct device *dev, | |||
1082 | fsm->b_bus_suspend, | 1082 | fsm->b_bus_suspend, |
1083 | fsm->b_conn, | 1083 | fsm->b_conn, |
1084 | fsm->b_se0_srp, | 1084 | fsm->b_se0_srp, |
1085 | fsm->b_sess_end, | 1085 | fsm->b_ssend_srp, |
1086 | fsm->b_sess_vld, | 1086 | fsm->b_sess_vld, |
1087 | fsm->id); | 1087 | fsm->id); |
1088 | size -= t; | 1088 | size -= t; |
diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c index cb0367c8e7a7..d5c6db004531 100644 --- a/drivers/usb/phy/phy-fsm-usb.c +++ b/drivers/usb/phy/phy-fsm-usb.c | |||
@@ -256,7 +256,7 @@ int otg_statemachine(struct otg_fsm *fsm) | |||
256 | otg_set_state(fsm, OTG_STATE_A_IDLE); | 256 | otg_set_state(fsm, OTG_STATE_A_IDLE); |
257 | else if (fsm->b_sess_vld && fsm->otg->gadget) | 257 | else if (fsm->b_sess_vld && fsm->otg->gadget) |
258 | otg_set_state(fsm, OTG_STATE_B_PERIPHERAL); | 258 | otg_set_state(fsm, OTG_STATE_B_PERIPHERAL); |
259 | else if (fsm->b_bus_req && fsm->b_sess_end && fsm->b_se0_srp) | 259 | else if (fsm->b_bus_req && fsm->b_ssend_srp && fsm->b_se0_srp) |
260 | otg_set_state(fsm, OTG_STATE_B_SRP_INIT); | 260 | otg_set_state(fsm, OTG_STATE_B_SRP_INIT); |
261 | break; | 261 | break; |
262 | case OTG_STATE_B_SRP_INIT: | 262 | case OTG_STATE_B_SRP_INIT: |
diff --git a/drivers/usb/phy/phy-fsm-usb.h b/drivers/usb/phy/phy-fsm-usb.h index 4049e5cc4abb..2f185ed0f54f 100644 --- a/drivers/usb/phy/phy-fsm-usb.h +++ b/drivers/usb/phy/phy-fsm-usb.h | |||
@@ -67,7 +67,7 @@ struct otg_fsm { | |||
67 | int b_bus_suspend; | 67 | int b_bus_suspend; |
68 | int b_conn; | 68 | int b_conn; |
69 | int b_se0_srp; | 69 | int b_se0_srp; |
70 | int b_sess_end; | 70 | int b_ssend_srp; |
71 | int b_sess_vld; | 71 | int b_sess_vld; |
72 | int id; | 72 | int id; |
73 | 73 | ||