usb: move the OTG state from the USB PHY to the OTG structure

[karo-tx-linux.git] / drivers / usb / phy / phy-fsl-usb.c

diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index f1ea5990a50a1436d856537131bde075515f8db7..15d7a81eece5cba7d195943a3099f2d2fe1b9ef4 100644 (file)
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -623,7 +623,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;
                }
        }
@@ -681,7 +681,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,7 +714,7 @@ 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);
@@ -989,10 +989,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;
        }