1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index f1ea5990a50a..ab38aa32a6c1 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -274,7 +274,7 @@ void b_srp_end(unsigned long foo)
         fsl_otg_dischrg_vbus(0);
         srp_wait_done = 1;
 
-        if ((fsl_otg_dev->phy.state == OTG_STATE_B_SRP_INIT) &&
+        if ((fsl_otg_dev->phy.otg->state == OTG_STATE_B_SRP_INIT) &&
             fsl_otg_dev->fsm.b_sess_vld)
                 fsl_otg_dev->fsm.b_srp_done = 1;
 }
@@ -499,7 +499,8 @@ int fsl_otg_start_host(struct otg_fsm *fsm, int on)
 {
         struct usb_otg *otg = fsm->otg;
         struct device *dev;
-        struct fsl_otg *otg_dev = container_of(otg->phy, struct fsl_otg, phy);
+        struct fsl_otg *otg_dev =
+                container_of(otg->usb_phy, struct fsl_otg, phy);
         u32 retval = 0;
 
         if (!otg->host)
@@ -594,7 +595,7 @@ static int fsl_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
         if (!otg)
                 return -ENODEV;
 
-        otg_dev = container_of(otg->phy, struct fsl_otg, phy);
+        otg_dev = container_of(otg->usb_phy, struct fsl_otg, phy);
         if (otg_dev != fsl_otg_dev)
                 return -ENODEV;
 
@@ -623,7 +624,7 @@ static int fsl_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
                         /* Mini-A cable connected */
                         struct otg_fsm *fsm = &otg_dev->fsm;
 
-                        otg->phy->state = OTG_STATE_UNDEFINED;
+                        otg->state = OTG_STATE_UNDEFINED;
                         fsm->protocol = PROTO_UNDEF;
                 }
         }
@@ -644,7 +645,7 @@ static int fsl_otg_set_peripheral(struct usb_otg *otg,
         if (!otg)
                 return -ENODEV;
 
-        otg_dev = container_of(otg->phy, struct fsl_otg, phy);
+        otg_dev = container_of(otg->usb_phy, struct fsl_otg, phy);
         VDBG("otg_dev 0x%x\n", (int)otg_dev);
         VDBG("fsl_otg_dev 0x%x\n", (int)fsl_otg_dev);
         if (otg_dev != fsl_otg_dev)
@@ -681,7 +682,7 @@ static int fsl_otg_set_power(struct usb_phy *phy, unsigned mA)
 {
         if (!fsl_otg_dev)
                 return -ENODEV;
-        if (phy->state == OTG_STATE_B_PERIPHERAL)
+        if (phy->otg->state == OTG_STATE_B_PERIPHERAL)
                 pr_info("FSL OTG: Draw %d mA\n", mA);
 
         return 0;
@@ -714,10 +715,10 @@ static int fsl_otg_start_srp(struct usb_otg *otg)
 {
         struct fsl_otg *otg_dev;
 
-        if (!otg || otg->phy->state != OTG_STATE_B_IDLE)
+        if (!otg || otg->state != OTG_STATE_B_IDLE)
                 return -ENODEV;
 
-        otg_dev = container_of(otg->phy, struct fsl_otg, phy);
+        otg_dev = container_of(otg->usb_phy, struct fsl_otg, phy);
         if (otg_dev != fsl_otg_dev)
                 return -ENODEV;
 
@@ -735,7 +736,7 @@ static int fsl_otg_start_hnp(struct usb_otg *otg)
         if (!otg)
                 return -ENODEV;
 
-        otg_dev = container_of(otg->phy, struct fsl_otg, phy);
+        otg_dev = container_of(otg->usb_phy, struct fsl_otg, phy);
         if (otg_dev != fsl_otg_dev)
                 return -ENODEV;
 
@@ -857,7 +858,7 @@ static int fsl_otg_conf(struct platform_device *pdev)
         fsl_otg_tc->phy.dev = &pdev->dev;
         fsl_otg_tc->phy.set_power = fsl_otg_set_power;
 
-        fsl_otg_tc->phy.otg->phy = &fsl_otg_tc->phy;
+        fsl_otg_tc->phy.otg->usb_phy = &fsl_otg_tc->phy;
         fsl_otg_tc->phy.otg->set_host = fsl_otg_set_host;
         fsl_otg_tc->phy.otg->set_peripheral = fsl_otg_set_peripheral;
         fsl_otg_tc->phy.otg->start_hnp = fsl_otg_start_hnp;
@@ -989,10 +990,10 @@ int usb_otg_start(struct platform_device *pdev)
          * Also: record initial state of ID pin
          */
         if (fsl_readl(&p_otg->dr_mem_map->otgsc) & OTGSC_STS_USB_ID) {
-                p_otg->phy.state = OTG_STATE_UNDEFINED;
+                p_otg->phy.otg->state = OTG_STATE_UNDEFINED;
                 p_otg->fsm.id = 1;
         } else {
-                p_otg->phy.state = OTG_STATE_A_IDLE;
+                p_otg->phy.otg->state = OTG_STATE_A_IDLE;
                 p_otg->fsm.id = 0;
         }
 
@@ -1047,7 +1048,7 @@ static int show_fsl_usb2_otg_state(struct device *dev,
         /* State */
         t = scnprintf(next, size,
                       "OTG state: %s\n\n",
-                      usb_otg_state_string(fsl_otg_dev->phy.state));
+                      usb_otg_state_string(fsl_otg_dev->phy.otg->state));
         size -= t;
         next += t;