68 files changed, 1186 insertions, 1024 deletions
diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c
index 0aa25364360..cc285e50728 100644
--- a/arch/arm/mach-imx/mx31moboard-devboard.c
+++ b/arch/arm/mach-imx/mx31moboard-devboard.c
@@ -158,7 +158,7 @@ static int devboard_usbh1_hw_init(struct platform_device *pdev)
 #define USBH1_VBUSEN_B  IOMUX_TO_GPIO(MX31_PIN_NFRE_B)
 #define USBH1_MODE      IOMUX_TO_GPIO(MX31_PIN_NFALE)
-static int devboard_isp1105_init(struct otg_transceiver *otg)
+static int devboard_isp1105_init(struct usb_phy *otg)
 {
        int ret = gpio_request(USBH1_MODE, "usbh1-mode");
        if (ret)
@@ -177,7 +177,7 @@ static int devboard_isp1105_init(struct otg_transceiver *otg)
 }
-static int devboard_isp1105_set_vbus(struct otg_transceiver *otg, bool on)
+static int devboard_isp1105_set_vbus(struct usb_otg *otg, bool on)
 {
        if (on)
                gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -194,18 +194,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = {
 static int __init devboard_usbh1_init(void)
 {
-        struct otg_transceiver *otg;
+        struct usb_phy *phy;
        struct platform_device *pdev;
-        otg = kzalloc(sizeof(*otg), GFP_KERNEL);
+        phy = kzalloc(sizeof(*phy), GFP_KERNEL);
-        if (!otg)
+        if (!phy)
                return -ENOMEM;
-        otg->label      = "ISP1105";
+        phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
-        otg->init       = devboard_isp1105_init;
+        if (!phy->otg) {
-        otg->set_vbus   = devboard_isp1105_set_vbus;
+                kfree(phy);
+                return -ENOMEM;
+        }
+        phy->label      = "ISP1105";
+        phy->init       = devboard_isp1105_init;
+        phy->otg->set_vbus      = devboard_isp1105_set_vbus;
-        usbh1_pdata.otg = otg;
+        usbh1_pdata.otg = phy;
        pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
        if (IS_ERR(pdev))
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index bb639cbda4e..135c90e3a45 100644
--- a/arch/arm/mach-imx/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -272,7 +272,7 @@ static int marxbot_usbh1_hw_init(struct platform_device *pdev)
 #define USBH1_VBUSEN_B  IOMUX_TO_GPIO(MX31_PIN_NFRE_B)
 #define USBH1_MODE      IOMUX_TO_GPIO(MX31_PIN_NFALE)
-static int marxbot_isp1105_init(struct otg_transceiver *otg)
+static int marxbot_isp1105_init(struct usb_phy *otg)
 {
        int ret = gpio_request(USBH1_MODE, "usbh1-mode");
        if (ret)
@@ -291,7 +291,7 @@ static int marxbot_isp1105_init(struct otg_transceiver *otg)
 }
-static int marxbot_isp1105_set_vbus(struct otg_transceiver *otg, bool on)
+static int marxbot_isp1105_set_vbus(struct usb_otg *otg, bool on)
 {
        if (on)
                gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -308,18 +308,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = {
 static int __init marxbot_usbh1_init(void)
 {
-        struct otg_transceiver *otg;
+        struct usb_phy *phy;
        struct platform_device *pdev;
-        otg = kzalloc(sizeof(*otg), GFP_KERNEL);
+        phy = kzalloc(sizeof(*phy), GFP_KERNEL);
-        if (!otg)
+        if (!phy)
                return -ENOMEM;
-        otg->label      = "ISP1105";
+        phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
-        otg->init       = marxbot_isp1105_init;
+        if (!phy->otg) {
-        otg->set_vbus   = marxbot_isp1105_set_vbus;
+                kfree(phy);
+                return -ENOMEM;
+        }
+        phy->label      = "ISP1105";
+        phy->init       = marxbot_isp1105_init;
+        phy->otg->set_vbus      = marxbot_isp1105_set_vbus;
-        usbh1_pdata.otg = otg;
+        usbh1_pdata.otg = phy;
        pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
        if (IS_ERR(pdev))
diff --git a/arch/arm/mach-pxa/pxa3xx-ulpi.c b/arch/arm/mach-pxa/pxa3xx-ulpi.c
index e28dfb88827..5ead6d480c6 100644
--- a/arch/arm/mach-pxa/pxa3xx-ulpi.c
+++ b/arch/arm/mach-pxa/pxa3xx-ulpi.c
@@ -33,7 +33,7 @@ struct pxa3xx_u2d_ulpi {
        struct clk              *clk;
        void __iomem            *mmio_base;
-        struct otg_transceiver  *otg;
+        struct usb_phy          *otg;
        unsigned int            ulpi_mode;
 };
@@ -79,7 +79,7 @@ static int pxa310_ulpi_poll(void)
        return -ETIMEDOUT;
 }
-static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg)
+static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
 {
        int err;
@@ -98,7 +98,7 @@ static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg)
        return u2d_readl(U2DOTGUCR) & U2DOTGUCR_RDATA;
 }
-static int pxa310_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
 {
        if (pxa310_ulpi_get_phymode() != SYNCH) {
                pr_warning("%s: PHY is not in SYNCH mode!\n", __func__);
@@ -111,7 +111,7 @@ static int pxa310_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
        return pxa310_ulpi_poll();
 }
-struct otg_io_access_ops pxa310_ulpi_access_ops = {
+struct usb_phy_io_ops pxa310_ulpi_access_ops = {
        .read   = pxa310_ulpi_read,
        .write  = pxa310_ulpi_write,
 };
@@ -139,19 +139,19 @@ static int pxa310_start_otg_host_transcvr(struct usb_bus *host)
        pxa310_otg_transceiver_rtsm();
-        err = otg_init(u2d->otg);
+        err = usb_phy_init(u2d->otg);
        if (err) {
                pr_err("OTG transceiver init failed");
                return err;
        }
-        err = otg_set_vbus(u2d->otg, 1);
+        err = otg_set_vbus(u2d->otg->otg, 1);
        if (err) {
                pr_err("OTG transceiver VBUS set failed");
                return err;
        }
-        err = otg_set_host(u2d->otg, host);
+        err = otg_set_host(u2d->otg->otg, host);
        if (err)
                pr_err("OTG transceiver Host mode set failed");
@@ -189,9 +189,9 @@ static void pxa310_stop_otg_hc(void)
 {
        pxa310_otg_transceiver_rtsm();
-        otg_set_host(u2d->otg, NULL);
+        otg_set_host(u2d->otg->otg, NULL);
-        otg_set_vbus(u2d->otg, 0);
+        otg_set_vbus(u2d->otg->otg, 0);
-        otg_shutdown(u2d->otg);
+        usb_phy_shutdown(u2d->otg);
 }
 static void pxa310_u2d_setup_otg_hc(void)
diff --git a/arch/arm/mach-tegra/include/mach/usb_phy.h b/arch/arm/mach-tegra/include/mach/usb_phy.h
index d4b8f9e298a..de1a0f602b2 100644
--- a/arch/arm/mach-tegra/include/mach/usb_phy.h
+++ b/arch/arm/mach-tegra/include/mach/usb_phy.h
@@ -58,7 +58,7 @@ struct tegra_usb_phy {
        struct clk *pad_clk;
        enum tegra_usb_phy_mode mode;
        void *config;
-        struct otg_transceiver *ulpi;
+        struct usb_phy *ulpi;
 };
 struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,
diff --git a/arch/arm/mach-tegra/usb_phy.c b/arch/arm/mach-tegra/usb_phy.c
index 37576a721ae..ad321f9e2bb 100644
--- a/arch/arm/mach-tegra/usb_phy.c
+++ b/arch/arm/mach-tegra/usb_phy.c
@@ -608,13 +608,13 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
        writel(val, base + ULPI_TIMING_CTRL_1);
        /* Fix VbusInvalid due to floating VBUS */
-        ret = otg_io_write(phy->ulpi, 0x40, 0x08);
+        ret = usb_phy_io_write(phy->ulpi, 0x40, 0x08);
        if (ret) {
                pr_err("%s: ulpi write failed\n", __func__);
                return ret;
        }
-        ret = otg_io_write(phy->ulpi, 0x80, 0x0B);
+        ret = usb_phy_io_write(phy->ulpi, 0x80, 0x0B);
        if (ret) {
                pr_err("%s: ulpi write failed\n", __func__);
                return ret;
diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
index 2c159dc2398..9ffd1bbe615 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_ehci.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
@@ -44,7 +44,7 @@ struct mxc_usbh_platform_data {
        int (*exit)(struct platform_device *pdev);
        unsigned int             portsc;
-        struct otg_transceiver  *otg;
+        struct usb_phy          *otg;
 };
 int mx51_initialize_usb_hw(int port, unsigned int flags);
diff --git a/arch/arm/plat-mxc/include/mach/ulpi.h b/arch/arm/plat-mxc/include/mach/ulpi.h
index f9161c96d7b..42bdaca6d7d 100644
--- a/arch/arm/plat-mxc/include/mach/ulpi.h
+++ b/arch/arm/plat-mxc/include/mach/ulpi.h
@@ -2,15 +2,15 @@
 #define __MACH_ULPI_H
 #ifdef CONFIG_USB_ULPI
-struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags);
+struct usb_phy *imx_otg_ulpi_create(unsigned int flags);
 #else
-static inline struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags)
+static inline struct usb_phy *imx_otg_ulpi_create(unsigned int flags)
 {
        return NULL;
 }
 #endif
-extern struct otg_io_access_ops mxc_ulpi_access_ops;
+extern struct usb_phy_io_ops mxc_ulpi_access_ops;
 #endif /* __MACH_ULPI_H */
diff --git a/arch/arm/plat-mxc/ulpi.c b/arch/arm/plat-mxc/ulpi.c
index 477e45bea1b..d2963427184 100644
--- a/arch/arm/plat-mxc/ulpi.c
+++ b/arch/arm/plat-mxc/ulpi.c
@@ -58,7 +58,7 @@ static int ulpi_poll(void __iomem *view, u32 bit)
        return -ETIMEDOUT;
 }
-static int ulpi_read(struct otg_transceiver *otg, u32 reg)
+static int ulpi_read(struct usb_phy *otg, u32 reg)
 {
        int ret;
        void __iomem *view = otg->io_priv;
@@ -84,7 +84,7 @@ static int ulpi_read(struct otg_transceiver *otg, u32 reg)
        return (__raw_readl(view) >> ULPIVW_RDATA_SHIFT) & ULPIVW_RDATA_MASK;
 }
-static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static int ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
 {
        int ret;
        void __iomem *view = otg->io_priv;
@@ -106,13 +106,13 @@ static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
        return ulpi_poll(view, ULPIVW_RUN);
 }
-struct otg_io_access_ops mxc_ulpi_access_ops = {
+struct usb_phy_io_ops mxc_ulpi_access_ops = {
        .read   = ulpi_read,
        .write  = ulpi_write,
 };
 EXPORT_SYMBOL_GPL(mxc_ulpi_access_ops);
-struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags)
+struct usb_phy *imx_otg_ulpi_create(unsigned int flags)
 {
        return otg_ulpi_create(&mxc_ulpi_access_ops, flags);
 }
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index b806667b59a..1289a5f790a 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -56,7 +56,7 @@ static u16 isp170x_id[] = {
 struct isp1704_charger {
        struct device           *dev;
        struct power_supply     psy;
-        struct otg_transceiver  *otg;
+        struct usb_phy          *phy;
        struct notifier_block   nb;
        struct work_struct      work;
@@ -71,6 +71,16 @@ struct isp1704_charger {
        unsigned                max_power;
 };
+static inline int isp1704_read(struct isp1704_charger *isp, u32 reg)
+{
+        return usb_phy_io_read(isp->phy, reg);
+}
+static inline int isp1704_write(struct isp1704_charger *isp, u32 val, u32 reg)
+{
+        return usb_phy_io_write(isp->phy, val, reg);
+}
 /*
 * Disable/enable the power from the isp1704 if a function for it
 * has been provided with platform data.
@@ -97,31 +107,31 @@ static inline int isp1704_charger_type(struct isp1704_charger *isp)
        u8 otg_ctrl;
        int type = POWER_SUPPLY_TYPE_USB_DCP;
-        func_ctrl = otg_io_read(isp->otg, ULPI_FUNC_CTRL);
+        func_ctrl = isp1704_read(isp, ULPI_FUNC_CTRL);
-        otg_ctrl = otg_io_read(isp->otg, ULPI_OTG_CTRL);
+        otg_ctrl = isp1704_read(isp, ULPI_OTG_CTRL);
        /* disable pulldowns */
        reg = ULPI_OTG_CTRL_DM_PULLDOWN | ULPI_OTG_CTRL_DP_PULLDOWN;
-        otg_io_write(isp->otg, ULPI_CLR(ULPI_OTG_CTRL), reg);
+        isp1704_write(isp, ULPI_CLR(ULPI_OTG_CTRL), reg);
        /* full speed */
-        otg_io_write(isp->otg, ULPI_CLR(ULPI_FUNC_CTRL),
+        isp1704_write(isp, ULPI_CLR(ULPI_FUNC_CTRL),
                        ULPI_FUNC_CTRL_XCVRSEL_MASK);
-        otg_io_write(isp->otg, ULPI_SET(ULPI_FUNC_CTRL),
+        isp1704_write(isp, ULPI_SET(ULPI_FUNC_CTRL),
                        ULPI_FUNC_CTRL_FULL_SPEED);
        /* Enable strong pull-up on DP (1.5K) and reset */
        reg = ULPI_FUNC_CTRL_TERMSELECT | ULPI_FUNC_CTRL_RESET;
-        otg_io_write(isp->otg, ULPI_SET(ULPI_FUNC_CTRL), reg);
+        isp1704_write(isp, ULPI_SET(ULPI_FUNC_CTRL), reg);
        usleep_range(1000, 2000);
-        reg = otg_io_read(isp->otg, ULPI_DEBUG);
+        reg = isp1704_read(isp, ULPI_DEBUG);
        if ((reg & 3) != 3)
                type = POWER_SUPPLY_TYPE_USB_CDP;
        /* recover original state */
-        otg_io_write(isp->otg, ULPI_FUNC_CTRL, func_ctrl);
+        isp1704_write(isp, ULPI_FUNC_CTRL, func_ctrl);
-        otg_io_write(isp->otg, ULPI_OTG_CTRL, otg_ctrl);
+        isp1704_write(isp, ULPI_OTG_CTRL, otg_ctrl);
        return type;
 }
@@ -136,28 +146,28 @@ static inline int isp1704_charger_verify(struct isp1704_charger *isp)
        u8      r;
        /* Reset the transceiver */
-        r = otg_io_read(isp->otg, ULPI_FUNC_CTRL);
+        r = isp1704_read(isp, ULPI_FUNC_CTRL);
        r |= ULPI_FUNC_CTRL_RESET;
-        otg_io_write(isp->otg, ULPI_FUNC_CTRL, r);
+        isp1704_write(isp, ULPI_FUNC_CTRL, r);
        usleep_range(1000, 2000);
        /* Set normal mode */
        r &= ~(ULPI_FUNC_CTRL_RESET | ULPI_FUNC_CTRL_OPMODE_MASK);
-        otg_io_write(isp->otg, ULPI_FUNC_CTRL, r);
+        isp1704_write(isp, ULPI_FUNC_CTRL, r);
        /* Clear the DP and DM pull-down bits */
        r = ULPI_OTG_CTRL_DP_PULLDOWN | ULPI_OTG_CTRL_DM_PULLDOWN;
-        otg_io_write(isp->otg, ULPI_CLR(ULPI_OTG_CTRL), r);
+        isp1704_write(isp, ULPI_CLR(ULPI_OTG_CTRL), r);
        /* Enable strong pull-up on DP (1.5K) and reset */
        r = ULPI_FUNC_CTRL_TERMSELECT | ULPI_FUNC_CTRL_RESET;
-        otg_io_write(isp->otg, ULPI_SET(ULPI_FUNC_CTRL), r);
+        isp1704_write(isp, ULPI_SET(ULPI_FUNC_CTRL), r);
        usleep_range(1000, 2000);
        /* Read the line state */
-        if (!otg_io_read(isp->otg, ULPI_DEBUG)) {
+        if (!isp1704_read(isp, ULPI_DEBUG)) {
                /* Disable strong pull-up on DP (1.5K) */
-                otg_io_write(isp->otg, ULPI_CLR(ULPI_FUNC_CTRL),
+                isp1704_write(isp, ULPI_CLR(ULPI_FUNC_CTRL),
                                ULPI_FUNC_CTRL_TERMSELECT);
                return 1;
        }
@@ -165,23 +175,23 @@ static inline int isp1704_charger_verify(struct isp1704_charger *isp)
        /* Is it a charger or PS/2 connection */
        /* Enable weak pull-up resistor on DP */
-        otg_io_write(isp->otg, ULPI_SET(ISP1704_PWR_CTRL),
+        isp1704_write(isp, ULPI_SET(ISP1704_PWR_CTRL),
                        ISP1704_PWR_CTRL_DP_WKPU_EN);
        /* Disable strong pull-up on DP (1.5K) */
-        otg_io_write(isp->otg, ULPI_CLR(ULPI_FUNC_CTRL),
+        isp1704_write(isp, ULPI_CLR(ULPI_FUNC_CTRL),
                        ULPI_FUNC_CTRL_TERMSELECT);
        /* Enable weak pull-down resistor on DM */
-        otg_io_write(isp->otg, ULPI_SET(ULPI_OTG_CTRL),
+        isp1704_write(isp, ULPI_SET(ULPI_OTG_CTRL),
                        ULPI_OTG_CTRL_DM_PULLDOWN);
        /* It's a charger if the line states are clear */
-        if (!(otg_io_read(isp->otg, ULPI_DEBUG)))
+        if (!(isp1704_read(isp, ULPI_DEBUG)))
                ret = 1;
        /* Disable weak pull-up resistor on DP */
-        otg_io_write(isp->otg, ULPI_CLR(ISP1704_PWR_CTRL),
+        isp1704_write(isp, ULPI_CLR(ISP1704_PWR_CTRL),
                        ISP1704_PWR_CTRL_DP_WKPU_EN);
        return ret;
@@ -193,14 +203,14 @@ static inline int isp1704_charger_detect(struct isp1704_charger *isp)
        u8              pwr_ctrl;
        int             ret = 0;
-        pwr_ctrl = otg_io_read(isp->otg, ISP1704_PWR_CTRL);
+        pwr_ctrl = isp1704_read(isp, ISP1704_PWR_CTRL);
        /* set SW control bit in PWR_CTRL register */
-        otg_io_write(isp->otg, ISP1704_PWR_CTRL,
+        isp1704_write(isp, ISP1704_PWR_CTRL,
                        ISP1704_PWR_CTRL_SWCTRL);
        /* enable manual charger detection */
-        otg_io_write(isp->otg, ULPI_SET(ISP1704_PWR_CTRL),
+        isp1704_write(isp, ULPI_SET(ISP1704_PWR_CTRL),
                        ISP1704_PWR_CTRL_SWCTRL
                        | ISP1704_PWR_CTRL_DPVSRC_EN);
        usleep_range(1000, 2000);
@@ -208,7 +218,7 @@ static inline int isp1704_charger_detect(struct isp1704_charger *isp)
        timeout = jiffies + msecs_to_jiffies(300);
        do {
                /* Check if there is a charger */
-                if (otg_io_read(isp->otg, ISP1704_PWR_CTRL)
+                if (isp1704_read(isp, ISP1704_PWR_CTRL)
                                & ISP1704_PWR_CTRL_VDAT_DET) {
                        ret = isp1704_charger_verify(isp);
                        break;
@@ -216,7 +226,7 @@ static inline int isp1704_charger_detect(struct isp1704_charger *isp)
        } while (!time_after(jiffies, timeout) && isp->online);
        /* recover original state */
-        otg_io_write(isp->otg, ISP1704_PWR_CTRL, pwr_ctrl);
+        isp1704_write(isp, ISP1704_PWR_CTRL, pwr_ctrl);
        return ret;
 }
@@ -264,8 +274,8 @@ static void isp1704_charger_work(struct work_struct *data)
                case POWER_SUPPLY_TYPE_USB:
                default:
                        /* enable data pullups */
-                        if (isp->otg->gadget)
+                        if (isp->phy->otg->gadget)
-                                usb_gadget_connect(isp->otg->gadget);
+                                usb_gadget_connect(isp->phy->otg->gadget);
                }
                break;
        case USB_EVENT_NONE:
@@ -283,8 +293,8 @@ static void isp1704_charger_work(struct work_struct *data)
                 * chargers. The pullups may be enabled elsewhere, so this can
                 * not be the final solution.
                 */
-                if (isp->otg->gadget)
+                if (isp->phy->otg->gadget)
-                        usb_gadget_disconnect(isp->otg->gadget);
+                        usb_gadget_disconnect(isp->phy->otg->gadget);
                isp1704_charger_set_power(isp, 0);
                break;
@@ -364,11 +374,11 @@ static inline int isp1704_test_ulpi(struct isp1704_charger *isp)
        int ret = -ENODEV;
        /* Test ULPI interface */
-        ret = otg_io_write(isp->otg, ULPI_SCRATCH, 0xaa);
+        ret = isp1704_write(isp, ULPI_SCRATCH, 0xaa);
        if (ret < 0)
                return ret;
-        ret = otg_io_read(isp->otg, ULPI_SCRATCH);
+        ret = isp1704_read(isp, ULPI_SCRATCH);
        if (ret < 0)
                return ret;
@@ -376,13 +386,13 @@ static inline int isp1704_test_ulpi(struct isp1704_charger *isp)
                return -ENODEV;
        /* Verify the product and vendor id matches */
-        vendor = otg_io_read(isp->otg, ULPI_VENDOR_ID_LOW);
+        vendor = isp1704_read(isp, ULPI_VENDOR_ID_LOW);
-        vendor |= otg_io_read(isp->otg, ULPI_VENDOR_ID_HIGH) << 8;
+        vendor |= isp1704_read(isp, ULPI_VENDOR_ID_HIGH) << 8;
        if (vendor != NXP_VENDOR_ID)
                return -ENODEV;
-        product = otg_io_read(isp->otg, ULPI_PRODUCT_ID_LOW);
+        product = isp1704_read(isp, ULPI_PRODUCT_ID_LOW);
-        product |= otg_io_read(isp->otg, ULPI_PRODUCT_ID_HIGH) << 8;
+        product |= isp1704_read(isp, ULPI_PRODUCT_ID_HIGH) << 8;
        for (i = 0; i < ARRAY_SIZE(isp170x_id); i++) {
                if (product == isp170x_id[i]) {
@@ -405,8 +415,8 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
        if (!isp)
                return -ENOMEM;
-        isp->otg = otg_get_transceiver();
+        isp->phy = usb_get_transceiver();
-        if (!isp->otg)
+        if (!isp->phy)
                goto fail0;
        isp->dev = &pdev->dev;
@@ -429,14 +439,14 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
                goto fail1;
        /*
-         * REVISIT: using work in order to allow the otg notifications to be
+         * REVISIT: using work in order to allow the usb notifications to be
         * made atomically in the future.
         */
        INIT_WORK(&isp->work, isp1704_charger_work);
        isp->nb.notifier_call = isp1704_notifier_call;
-        ret = otg_register_notifier(isp->otg, &isp->nb);
+        ret = usb_register_notifier(isp->phy, &isp->nb);
        if (ret)
                goto fail2;
@@ -449,13 +459,13 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
         * enumerated. The charger driver should be always loaded before any
         * gadget is loaded.
         */
-        if (isp->otg->gadget)
+        if (isp->phy->otg->gadget)
-                usb_gadget_disconnect(isp->otg->gadget);
+                usb_gadget_disconnect(isp->phy->otg->gadget);
        /* Detect charger if VBUS is valid (the cable was already plugged). */
-        ret = otg_io_read(isp->otg, ULPI_USB_INT_STS);
+        ret = isp1704_read(isp, ULPI_USB_INT_STS);
        isp1704_charger_set_power(isp, 0);
-        if ((ret & ULPI_INT_VBUS_VALID) && !isp->otg->default_a) {
+        if ((ret & ULPI_INT_VBUS_VALID) && !isp->phy->otg->default_a) {
                isp->event = USB_EVENT_VBUS;
                schedule_work(&isp->work);
        }
@@ -464,7 +474,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 fail2:
        power_supply_unregister(&isp->psy);
 fail1:
-        otg_put_transceiver(isp->otg);
+        usb_put_transceiver(isp->phy);
 fail0:
        kfree(isp);
@@ -477,9 +487,9 @@ static int __devexit isp1704_charger_remove(struct platform_device *pdev)
 {
        struct isp1704_charger *isp = platform_get_drvdata(pdev);
-        otg_unregister_notifier(isp->otg, &isp->nb);
+        usb_unregister_notifier(isp->phy, &isp->nb);
        power_supply_unregister(&isp->psy);
-        otg_put_transceiver(isp->otg);
+        usb_put_transceiver(isp->phy);
        isp1704_charger_set_power(isp, 0);
        kfree(isp);
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index fd49689738a..214468f4444 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -40,7 +40,7 @@ static struct timer_list polling_timer;
 static int polling;
 #ifdef CONFIG_USB_OTG_UTILS
-static struct otg_transceiver *transceiver;
+static struct usb_phy *transceiver;
 static struct notifier_block otg_nb;
 #endif
@@ -321,7 +321,7 @@ static int pda_power_probe(struct platform_device *pdev)
        }
 #ifdef CONFIG_USB_OTG_UTILS
-        transceiver = otg_get_transceiver();
+        transceiver = usb_get_transceiver();
        if (transceiver && !pdata->is_usb_online) {
                pdata->is_usb_online = otg_is_usb_online;
        }
@@ -375,7 +375,7 @@ static int pda_power_probe(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG_UTILS
        if (transceiver && pdata->use_otg_notifier) {
                otg_nb.notifier_call = otg_handle_notification;
-                ret = otg_register_notifier(transceiver, &otg_nb);
+                ret = usb_register_notifier(transceiver, &otg_nb);
                if (ret) {
                        dev_err(dev, "failure to register otg notifier\n");
                        goto otg_reg_notifier_failed;
@@ -409,7 +409,7 @@ usb_supply_failed:
                free_irq(ac_irq->start, &pda_psy_ac);
 #ifdef CONFIG_USB_OTG_UTILS
        if (transceiver)
-                otg_put_transceiver(transceiver);
+                usb_put_transceiver(transceiver);
 #endif
 ac_irq_failed:
        if (pdata->is_ac_online)
@@ -444,7 +444,7 @@ static int pda_power_remove(struct platform_device *pdev)
                power_supply_unregister(&pda_psy_ac);
 #ifdef CONFIG_USB_OTG_UTILS
        if (transceiver)
-                otg_put_transceiver(transceiver);
+                usb_put_transceiver(transceiver);
 #endif
        if (ac_draw) {
                regulator_put(ac_draw);
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 54b9198fa57..fdad850c77d 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -69,8 +69,8 @@ struct twl4030_bci {
        struct device           *dev;
        struct power_supply     ac;
        struct power_supply     usb;
-        struct otg_transceiver  *transceiver;
+        struct usb_phy          *transceiver;
-        struct notifier_block   otg_nb;
+        struct notifier_block   usb_nb;
        struct work_struct      work;
        int                     irq_chg;
        int                     irq_bci;
@@ -279,7 +279,7 @@ static void twl4030_bci_usb_work(struct work_struct *data)
 static int twl4030_bci_usb_ncb(struct notifier_block *nb, unsigned long val,
                               void *priv)
 {
-        struct twl4030_bci *bci = container_of(nb, struct twl4030_bci, otg_nb);
+        struct twl4030_bci *bci = container_of(nb, struct twl4030_bci, usb_nb);
        dev_dbg(bci->dev, "OTG notify %lu\n", val);
@@ -479,10 +479,10 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
        INIT_WORK(&bci->work, twl4030_bci_usb_work);
-        bci->transceiver = otg_get_transceiver();
+        bci->transceiver = usb_get_transceiver();
        if (bci->transceiver != NULL) {
-                bci->otg_nb.notifier_call = twl4030_bci_usb_ncb;
+                bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
-                otg_register_notifier(bci->transceiver, &bci->otg_nb);
+                usb_register_notifier(bci->transceiver, &bci->usb_nb);
        }
        /* Enable interrupts now. */
@@ -508,8 +508,8 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
 fail_unmask_interrupts:
        if (bci->transceiver != NULL) {
-                otg_unregister_notifier(bci->transceiver, &bci->otg_nb);
+                usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
-                otg_put_transceiver(bci->transceiver);
+                usb_put_transceiver(bci->transceiver);
        }
        free_irq(bci->irq_bci, bci);
 fail_bci_irq:
@@ -539,8 +539,8 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
                         TWL4030_INTERRUPTS_BCIIMR2A);
        if (bci->transceiver != NULL) {
-                otg_unregister_notifier(bci->transceiver, &bci->otg_nb);
+                usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
-                otg_put_transceiver(bci->transceiver);
+                usb_put_transceiver(bci->transceiver);
        }
        free_irq(bci->irq_bci, bci);
        free_irq(bci->irq_chg, bci);
diff --git a/drivers/usb/gadget/ci13xxx_msm.c b/drivers/usb/gadget/ci13xxx_msm.c
index 1fc612914c5..d07e44c05e9 100644
--- a/drivers/usb/gadget/ci13xxx_msm.c
+++ b/drivers/usb/gadget/ci13xxx_msm.c
@@ -37,10 +37,10 @@ static void ci13xxx_msm_notify_event(struct ci13xxx *udc, unsigned event)
                 * Put the transceiver in non-driving mode. Otherwise host
                 * may not detect soft-disconnection.
                 */
-                val = otg_io_read(udc->transceiver, ULPI_FUNC_CTRL);
+                val = usb_phy_io_read(udc->transceiver, ULPI_FUNC_CTRL);
                val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
                val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-                otg_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);
+                usb_phy_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);
                break;
        default:
                dev_dbg(dev, "unknown ci13xxx_udc event\n");
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 27e31371842..b27cb0b0077 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -2537,7 +2537,7 @@ static int ci13xxx_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
        struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget);
        if (udc->transceiver)
-                return otg_set_power(udc->transceiver, mA);
+                return usb_phy_set_power(udc->transceiver, mA);
        return -ENOTSUPP;
 }
@@ -2900,7 +2900,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev,
        if (retval < 0)
                goto free_udc;
-        udc->transceiver = otg_get_transceiver();
+        udc->transceiver = usb_get_transceiver();
        if (udc->udc_driver->flags & CI13XXX_REQUIRE_TRANSCEIVER) {
                if (udc->transceiver == NULL) {
@@ -2928,7 +2928,8 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev,
                goto unreg_device;
        if (udc->transceiver) {
-                retval = otg_set_peripheral(udc->transceiver, &udc->gadget);
+                retval = otg_set_peripheral(udc->transceiver->otg,
+                                                &udc->gadget);
                if (retval)
                        goto remove_dbg;
        }
@@ -2945,8 +2946,8 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev,
 remove_trans:
        if (udc->transceiver) {
-                otg_set_peripheral(udc->transceiver, &udc->gadget);
+                otg_set_peripheral(udc->transceiver->otg, &udc->gadget);
-                otg_put_transceiver(udc->transceiver);
+                usb_put_transceiver(udc->transceiver);
        }
        err("error = %i", retval);
@@ -2958,7 +2959,7 @@ unreg_device:
        device_unregister(&udc->gadget.dev);
 put_transceiver:
        if (udc->transceiver)
-                otg_put_transceiver(udc->transceiver);
+                usb_put_transceiver(udc->transceiver);
 free_udc:
        kfree(udc);
        _udc = NULL;
@@ -2981,8 +2982,8 @@ static void udc_remove(void)
        usb_del_gadget_udc(&udc->gadget);
        if (udc->transceiver) {
-                otg_set_peripheral(udc->transceiver, &udc->gadget);
+                otg_set_peripheral(udc->transceiver->otg, &udc->gadget);
-                otg_put_transceiver(udc->transceiver);
+                usb_put_transceiver(udc->transceiver);
        }
 #ifdef CONFIG_USB_GADGET_DEBUG_FILES
        dbg_remove_files(&udc->gadget.dev);
diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h
index f4871e1fac5..0d31af56c98 100644
--- a/drivers/usb/gadget/ci13xxx_udc.h
+++ b/drivers/usb/gadget/ci13xxx_udc.h
@@ -136,7 +136,7 @@ struct ci13xxx {
        struct usb_gadget_driver  *driver;     /* 3rd party gadget driver */
        struct ci13xxx_udc_driver *udc_driver; /* device controller driver */
        int                        vbus_active; /* is VBUS active */
-        struct otg_transceiver    *transceiver; /* Transceiver struct */
+        struct usb_phy            *transceiver; /* Transceiver struct */
 };
 /******************************************************************************
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index b04712f19f1..1e8c0c425fa 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1217,7 +1217,7 @@ static int fsl_vbus_draw(struct usb_gadget *gadget, unsigned mA)
        udc = container_of(gadget, struct fsl_udc, gadget);
        if (udc->transceiver)
-                return otg_set_power(udc->transceiver, mA);
+                return usb_phy_set_power(udc->transceiver, mA);
        return -ENOTSUPP;
 }
@@ -1966,7 +1966,8 @@ static int fsl_start(struct usb_gadget_driver *driver,
                /* connect to bus through transceiver */
                if (udc_controller->transceiver) {
-                        retval = otg_set_peripheral(udc_controller->transceiver,
+                        retval = otg_set_peripheral(
+                                        udc_controller->transceiver->otg,
                                                    &udc_controller->gadget);
                        if (retval < 0) {
                                ERR("can't bind to transceiver\n");
@@ -2006,7 +2007,7 @@ static int fsl_stop(struct usb_gadget_driver *driver)
                return -EINVAL;
        if (udc_controller->transceiver)
-                otg_set_peripheral(udc_controller->transceiver, NULL);
+                otg_set_peripheral(udc_controller->transceiver->otg, NULL);
        /* stop DR, disable intr */
        dr_controller_stop(udc_controller);
@@ -2430,7 +2431,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG
        if (pdata->operating_mode == FSL_USB2_DR_OTG) {
-                udc_controller->transceiver = otg_get_transceiver();
+                udc_controller->transceiver = usb_get_transceiver();
                if (!udc_controller->transceiver) {
                        ERR("Can't find OTG driver!\n");
                        ret = -ENODEV;
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index f781f5dec41..e651469fd39 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -471,7 +471,7 @@ struct fsl_udc {
        struct usb_ctrlrequest local_setup_buff;
        spinlock_t lock;
-        struct otg_transceiver *transceiver;
+        struct usb_phy *transceiver;
        unsigned softconnect:1;
        unsigned vbus_active:1;
        unsigned stopped:1;
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index e2293c1588e..42a88b680f2 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -1261,9 +1261,9 @@ static int langwell_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
        dev_vdbg(&dev->pdev->dev, "---> %s()\n", __func__);
        if (dev->transceiver) {
-                dev_vdbg(&dev->pdev->dev, "otg_set_power\n");
+                dev_vdbg(&dev->pdev->dev, "usb_phy_set_power\n");
                dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
-                return otg_set_power(dev->transceiver, mA);
+                return usb_phy_set_power(dev->transceiver, mA);
        }
        dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
@@ -1906,7 +1906,7 @@ static int langwell_stop(struct usb_gadget *g,
        /* unbind OTG transceiver */
        if (dev->transceiver)
-                (void)otg_set_peripheral(dev->transceiver, 0);
+                (void)otg_set_peripheral(dev->transceiver->otg, 0);
        /* disable interrupt and set controller to stop state */
        langwell_udc_stop(dev);
diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h
index d6e78accaff..8c8087abb48 100644
--- a/drivers/usb/gadget/langwell_udc.h
+++ b/drivers/usb/gadget/langwell_udc.h
@@ -162,7 +162,7 @@ struct langwell_udc {
        spinlock_t              lock;   /* device lock */
        struct langwell_ep      *ep;
        struct usb_gadget_driver        *driver;
-        struct otg_transceiver  *transceiver;
+        struct usb_phy          *transceiver;
        u8                      dev_addr;
        u32                     usb_state;
        u32                     resume_state;
diff --git a/drivers/usb/gadget/mv_udc.h b/drivers/usb/gadget/mv_udc.h
index 34aadfae723..e2be9519abb 100644
--- a/drivers/usb/gadget/mv_udc.h
+++ b/drivers/usb/gadget/mv_udc.h
@@ -217,7 +217,7 @@ struct mv_udc {
        struct work_struct      vbus_work;
        struct workqueue_struct *qwork;
-        struct otg_transceiver  *transceiver;
+        struct usb_phy          *transceiver;
        struct mv_usb_platform_data     *pdata;
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index f97e737d26f..7369fd92c03 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -1384,7 +1384,8 @@ static int mv_udc_start(struct usb_gadget_driver *driver,
        }
        if (udc->transceiver) {
-                retval = otg_set_peripheral(udc->transceiver, &udc->gadget);
+                retval = otg_set_peripheral(udc->transceiver->otg,
+                                        &udc->gadget);
                if (retval) {
                        dev_err(&udc->dev->dev,
                                "unable to register peripheral to otg\n");
@@ -2181,7 +2182,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
 #ifdef CONFIG_USB_OTG_UTILS
        if (pdata->mode == MV_USB_MODE_OTG)
-                udc->transceiver = otg_get_transceiver();
+                udc->transceiver = usb_get_transceiver();
 #endif
        udc->clknum = pdata->clknum;
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 576cd8578b4..ace8a652b32 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -1213,7 +1213,7 @@ static int omap_wakeup(struct usb_gadget *gadget)
        /* NOTE:  non-OTG systems may use SRP TOO... */
        } else if (!(udc->devstat & UDC_ATT)) {
                if (udc->transceiver)
-                        retval = otg_start_srp(udc->transceiver);
+                        retval = otg_start_srp(udc->transceiver->otg);
        }
        spin_unlock_irqrestore(&udc->lock, flags);
@@ -1345,7 +1345,7 @@ static int omap_vbus_draw(struct usb_gadget *gadget, unsigned mA)
        udc = container_of(gadget, struct omap_udc, gadget);
        if (udc->transceiver)
-                return otg_set_power(udc->transceiver, mA);
+                return usb_phy_set_power(udc->transceiver, mA);
        return -EOPNOTSUPP;
 }
@@ -1839,11 +1839,13 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                                        spin_lock(&udc->lock);
                                }
                                if (udc->transceiver)
-                                        otg_set_suspend(udc->transceiver, 1);
+                                        usb_phy_set_suspend(
+                                                        udc->transceiver, 1);
                        } else {
                                VDBG("resume\n");
                                if (udc->transceiver)
-                                        otg_set_suspend(udc->transceiver, 0);
+                                        usb_phy_set_suspend(
+                                                        udc->transceiver, 0);
                                if (udc->gadget.speed == USB_SPEED_FULL
                                                && udc->driver->resume) {
                                        spin_unlock(&udc->lock);
@@ -2154,7 +2156,8 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
        /* connect to bus through transceiver */
        if (udc->transceiver) {
-                status = otg_set_peripheral(udc->transceiver, &udc->gadget);
+                status = otg_set_peripheral(udc->transceiver->otg,
+                                                &udc->gadget);
                if (status < 0) {
                        ERR("can't bind to transceiver\n");
                        if (driver->unbind) {
@@ -2200,7 +2203,7 @@ static int omap_udc_stop(struct usb_gadget_driver *driver)
                omap_vbus_session(&udc->gadget, 0);
        if (udc->transceiver)
-                (void) otg_set_peripheral(udc->transceiver, NULL);
+                (void) otg_set_peripheral(udc->transceiver->otg, NULL);
        else
                pullup_disable(udc);
@@ -2650,7 +2653,7 @@ static void omap_udc_release(struct device *dev)
 }
 static int __init
-omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
+omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
 {
        unsigned        tmp, buf;
@@ -2790,7 +2793,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
 {
        int                     status = -ENODEV;
        int                     hmc;
-        struct otg_transceiver  *xceiv = NULL;
+        struct usb_phy          *xceiv = NULL;
        const char              *type = NULL;
        struct omap_usb_config  *config = pdev->dev.platform_data;
        struct clk              *dc_clk;
@@ -2863,7 +2866,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                 * use it.  Except for OTG, we don't _need_ to talk to one;
                 * but not having one probably means no VBUS detection.
                 */
-                xceiv = otg_get_transceiver();
+                xceiv = usb_get_transceiver();
                if (xceiv)
                        type = xceiv->label;
                else if (config->otg) {
@@ -3009,7 +3012,7 @@ cleanup1:
 cleanup0:
        if (xceiv)
-                otg_put_transceiver(xceiv);
+                usb_put_transceiver(xceiv);
        if (cpu_is_omap16xx() || cpu_is_omap24xx() || cpu_is_omap7xx()) {
                clk_disable(hhc_clk);
@@ -3039,7 +3042,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
        pullup_disable(udc);
        if (udc->transceiver) {
-                otg_put_transceiver(udc->transceiver);
+                usb_put_transceiver(udc->transceiver);
                udc->transceiver = NULL;
        }
        omap_writew(0, UDC_SYSCON1);
diff --git a/drivers/usb/gadget/omap_udc.h b/drivers/usb/gadget/omap_udc.h
index 29edc51b6b2..59d3b2213cb 100644
--- a/drivers/usb/gadget/omap_udc.h
+++ b/drivers/usb/gadget/omap_udc.h
@@ -164,7 +164,7 @@ struct omap_udc {
        struct omap_ep                  ep[32];
        u16                             devstat;
        u16                             clr_halt;
-        struct otg_transceiver          *transceiver;
+        struct usb_phy                  *transceiver;
        struct list_head                iso;
        unsigned                        softconnect:1;
        unsigned                        vbus_active:1;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index dd470635f4f..df681b5cd69 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -995,7 +995,7 @@ static int pxa25x_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
        udc = container_of(_gadget, struct pxa25x_udc, gadget);
        if (udc->transceiver)
-                return otg_set_power(udc->transceiver, mA);
+                return usb_phy_set_power(udc->transceiver, mA);
        return -EOPNOTSUPP;
 }
@@ -1301,7 +1301,8 @@ fail:
        /* connect to bus through transceiver */
        if (dev->transceiver) {
-                retval = otg_set_peripheral(dev->transceiver, &dev->gadget);
+                retval = otg_set_peripheral(dev->transceiver->otg,
+                                                &dev->gadget);
                if (retval) {
                        DMSG("can't bind to transceiver\n");
                        if (driver->unbind)
@@ -1360,7 +1361,7 @@ static int pxa25x_stop(struct usb_gadget_driver *driver)
        local_irq_enable();
        if (dev->transceiver)
-                (void) otg_set_peripheral(dev->transceiver, NULL);
+                (void) otg_set_peripheral(dev->transceiver->otg, NULL);
        driver->unbind(&dev->gadget);
        dev->gadget.dev.driver = NULL;
@@ -2159,7 +2160,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
        dev->dev = &pdev->dev;
        dev->mach = pdev->dev.platform_data;
-        dev->transceiver = otg_get_transceiver();
+        dev->transceiver = usb_get_transceiver();
        if (gpio_is_valid(dev->mach->gpio_pullup)) {
                if ((retval = gpio_request(dev->mach->gpio_pullup,
@@ -2238,7 +2239,7 @@ lubbock_fail0:
                gpio_free(dev->mach->gpio_pullup);
 err_gpio_pullup:
        if (dev->transceiver) {
-                otg_put_transceiver(dev->transceiver);
+                usb_put_transceiver(dev->transceiver);
                dev->transceiver = NULL;
        }
        clk_put(dev->clk);
@@ -2280,7 +2281,7 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev)
        clk_put(dev->clk);
        if (dev->transceiver) {
-                otg_put_transceiver(dev->transceiver);
+                usb_put_transceiver(dev->transceiver);
                dev->transceiver = NULL;
        }
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h
index 8eaf4e43726..893e917f048 100644
--- a/drivers/usb/gadget/pxa25x_udc.h
+++ b/drivers/usb/gadget/pxa25x_udc.h
@@ -119,7 +119,7 @@ struct pxa25x_udc {
        struct device                           *dev;
        struct clk                              *clk;
        struct pxa2xx_udc_mach_info             *mach;
-        struct otg_transceiver                  *transceiver;
+        struct usb_phy                          *transceiver;
        u64                                     dma_mask;
        struct pxa25x_ep                        ep [PXA_UDC_NUM_ENDPOINTS];
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index f4c44eb806c..98acb3ab9e1 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1666,7 +1666,7 @@ static int pxa_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
        udc = to_gadget_udc(_gadget);
        if (udc->transceiver)
-                return otg_set_power(udc->transceiver, mA);
+                return usb_phy_set_power(udc->transceiver, mA);
        return -EOPNOTSUPP;
 }
@@ -1835,7 +1835,8 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
                driver->driver.name);
        if (udc->transceiver) {
-                retval = otg_set_peripheral(udc->transceiver, &udc->gadget);
+                retval = otg_set_peripheral(udc->transceiver->otg,
+                                                &udc->gadget);
                if (retval) {
                        dev_err(udc->dev, "can't bind to transceiver\n");
                        goto transceiver_fail;
@@ -1908,7 +1909,7 @@ static int pxa27x_udc_stop(struct usb_gadget_driver *driver)
                 driver->driver.name);
        if (udc->transceiver)
-                return otg_set_peripheral(udc->transceiver, NULL);
+                return otg_set_peripheral(udc->transceiver->otg, NULL);
        return 0;
 }
@@ -2463,7 +2464,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
        udc->dev = &pdev->dev;
        udc->mach = pdev->dev.platform_data;
-        udc->transceiver = otg_get_transceiver();
+        udc->transceiver = usb_get_transceiver();
        gpio = udc->mach->gpio_pullup;
        if (gpio_is_valid(gpio)) {
@@ -2542,7 +2543,7 @@ static int __exit pxa_udc_remove(struct platform_device *_dev)
        if (gpio_is_valid(gpio))
                gpio_free(gpio);
-        otg_put_transceiver(udc->transceiver);
+        usb_put_transceiver(udc->transceiver);
        udc->transceiver = NULL;
        platform_set_drvdata(_dev, NULL);
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/pxa27x_udc.h
index 7f4e8f424e8..a1d268c6f2c 100644
--- a/drivers/usb/gadget/pxa27x_udc.h
+++ b/drivers/usb/gadget/pxa27x_udc.h
@@ -447,7 +447,7 @@ struct pxa_udc {
        struct usb_gadget_driver                *driver;
        struct device                           *dev;
        struct pxa2xx_udc_mach_info             *mach;
-        struct otg_transceiver                  *transceiver;
+        struct usb_phy                          *transceiver;
        enum ep0_state                          ep0state;
        struct udc_stats                        stats;
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index df8661d266c..c2f3aa65058 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -145,7 +145,7 @@ struct s3c_hsudc {
        struct usb_gadget_driver *driver;
        struct device *dev;
        struct s3c24xx_hsudc_platdata *pd;
-        struct otg_transceiver *transceiver;
+        struct usb_phy *transceiver;
        struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsudc_supply_names)];
        spinlock_t lock;
        void __iomem *regs;
@@ -1166,7 +1166,8 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,
        /* connect to bus through transceiver */
        if (hsudc->transceiver) {
-                ret = otg_set_peripheral(hsudc->transceiver, &hsudc->gadget);
+                ret = otg_set_peripheral(hsudc->transceiver->otg,
+                                        &hsudc->gadget);
                if (ret) {
                        dev_err(hsudc->dev, "%s: can't bind to transceiver\n",
                                        hsudc->gadget.name);
@@ -1214,7 +1215,7 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget,
        spin_unlock_irqrestore(&hsudc->lock, flags);
        if (hsudc->transceiver)
-                (void) otg_set_peripheral(hsudc->transceiver, NULL);
+                (void) otg_set_peripheral(hsudc->transceiver->otg, NULL);
        disable_irq(hsudc->irq);
@@ -1243,7 +1244,7 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
                return -ENODEV;
        if (hsudc->transceiver)
-                return otg_set_power(hsudc->transceiver, mA);
+                return usb_phy_set_power(hsudc->transceiver, mA);
        return -EOPNOTSUPP;
 }
@@ -1275,7 +1276,7 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev)
        hsudc->dev = dev;
        hsudc->pd = pdev->dev.platform_data;
-        hsudc->transceiver = otg_get_transceiver();
+        hsudc->transceiver = usb_get_transceiver();
        for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
                hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
@@ -1377,7 +1378,7 @@ err_remap:
        release_mem_region(res->start, resource_size(res));
 err_res:
        if (hsudc->transceiver)
-                otg_put_transceiver(hsudc->transceiver);
+                usb_put_transceiver(hsudc->transceiver);
        regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
 err_supplies:
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 7a15c223575..cf5666735a8 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -142,12 +142,12 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
        if (pdata->operating_mode == FSL_USB2_DR_OTG) {
                struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-                ehci->transceiver = otg_get_transceiver();
+                ehci->transceiver = usb_get_transceiver();
                dev_dbg(&pdev->dev, "hcd=0x%p  ehci=0x%p, transceiver=0x%p\n",
                        hcd, ehci, ehci->transceiver);
                if (ehci->transceiver) {
-                        retval = otg_set_host(ehci->transceiver,
+                        retval = otg_set_host(ehci->transceiver->otg,
                                              &ehci_to_hcd(ehci)->self);
                        if (retval) {
                                if (ehci->transceiver)
@@ -194,7 +194,7 @@ static void usb_hcd_fsl_remove(struct usb_hcd *hcd,
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
        if (ehci->transceiver) {
-                otg_set_host(ehci->transceiver, NULL);
+                otg_set_host(ehci->transceiver->otg, NULL);
                put_device(ehci->transceiver->dev);
        }
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 01011dd0cb5..256fbd42e48 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -727,7 +727,7 @@ static int ehci_hub_control (
 #ifdef CONFIG_USB_OTG
                        if ((hcd->self.otg_port == (wIndex + 1))
                            && hcd->self.b_hnp_enable) {
-                                otg_start_hnp(ehci->transceiver);
+                                otg_start_hnp(ehci->transceiver->otg);
                                break;
                        }
 #endif
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 592d5f76803..9803a55fd5f 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -32,7 +32,7 @@
 #define MSM_USB_BASE (hcd->regs)
-static struct otg_transceiver *otg;
+static struct usb_phy *phy;
 static int ehci_msm_reset(struct usb_hcd *hcd)
 {
@@ -145,14 +145,14 @@ static int ehci_msm_probe(struct platform_device *pdev)
         * powering up VBUS, mapping of registers address space and power
         * management.
         */
-        otg = otg_get_transceiver();
+        phy = usb_get_transceiver();
-        if (!otg) {
+        if (!phy) {
                dev_err(&pdev->dev, "unable to find transceiver\n");
                ret = -ENODEV;
                goto unmap;
        }
-        ret = otg_set_host(otg, &hcd->self);
+        ret = otg_set_host(phy->otg, &hcd->self);
        if (ret < 0) {
                dev_err(&pdev->dev, "unable to register with transceiver\n");
                goto put_transceiver;
@@ -169,7 +169,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
        return 0;
 put_transceiver:
-        otg_put_transceiver(otg);
+        usb_put_transceiver(phy);
 unmap:
        iounmap(hcd->regs);
 put_hcd:
@@ -186,8 +186,8 @@ static int __devexit ehci_msm_remove(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
        pm_runtime_set_suspended(&pdev->dev);
-        otg_set_host(otg, NULL);
+        otg_set_host(phy->otg, NULL);
-        otg_put_transceiver(otg);
+        usb_put_transceiver(phy);
        usb_put_hcd(hcd);
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 52a604fb932..a936bbcff8f 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -28,7 +28,7 @@ struct ehci_hcd_mv {
        void __iomem *cap_regs;
        void __iomem *op_regs;
-        struct otg_transceiver *otg;
+        struct usb_phy *otg;
        struct mv_usb_platform_data *pdata;
@@ -253,7 +253,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
        ehci_mv->mode = pdata->mode;
        if (ehci_mv->mode == MV_USB_MODE_OTG) {
 #ifdef CONFIG_USB_OTG_UTILS
-                ehci_mv->otg = otg_get_transceiver();
+                ehci_mv->otg = usb_get_transceiver();
                if (!ehci_mv->otg) {
                        dev_err(&pdev->dev,
                                "unable to find transceiver\n");
@@ -261,7 +261,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
                        goto err_disable_clk;
                }
-                retval = otg_set_host(ehci_mv->otg, &hcd->self);
+                retval = otg_set_host(ehci_mv->otg->otg, &hcd->self);
                if (retval < 0) {
                        dev_err(&pdev->dev,
                                "unable to register with transceiver\n");
@@ -303,7 +303,7 @@ err_set_vbus:
 #ifdef CONFIG_USB_OTG_UTILS
 err_put_transceiver:
        if (ehci_mv->otg)
-                otg_put_transceiver(ehci_mv->otg);
+                usb_put_transceiver(ehci_mv->otg);
 #endif
 err_disable_clk:
        mv_ehci_disable(ehci_mv);
@@ -332,8 +332,8 @@ static int mv_ehci_remove(struct platform_device *pdev)
                usb_remove_hcd(hcd);
        if (ehci_mv->otg) {
-                otg_set_host(ehci_mv->otg, NULL);
+                otg_set_host(ehci_mv->otg->otg, NULL);
-                otg_put_transceiver(ehci_mv->otg);
+                usb_put_transceiver(ehci_mv->otg);
        }
        if (ehci_mv->mode == MV_USB_MODE_HOST) {
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 55978fcfa4b..a797d51ecbe 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -220,13 +220,13 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
        /* Initialize the transceiver */
        if (pdata->otg) {
                pdata->otg->io_priv = hcd->regs + ULPI_VIEWPORT_OFFSET;
-                ret = otg_init(pdata->otg);
+                ret = usb_phy_init(pdata->otg);
                if (ret) {
                        dev_err(dev, "unable to init transceiver, probably missing\n");
                        ret = -ENODEV;
                        goto err_add;
                }
-                ret = otg_set_vbus(pdata->otg, 1);
+                ret = otg_set_vbus(pdata->otg->otg, 1);
                if (ret) {
                        dev_err(dev, "unable to enable vbus on transceiver\n");
                        goto err_add;
@@ -247,9 +247,11 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
                 * It's in violation of USB specs
                 */
                if (machine_is_mx51_efikamx() || machine_is_mx51_efikasb()) {
-                        flags = otg_io_read(pdata->otg, ULPI_OTG_CTRL);
+                        flags = usb_phy_io_read(pdata->otg,
+                                                        ULPI_OTG_CTRL);
                        flags |= ULPI_OTG_CTRL_CHRGVBUS;
-                        ret = otg_io_write(pdata->otg, flags, ULPI_OTG_CTRL);
+                        ret = usb_phy_io_write(pdata->otg, flags,
+                                                        ULPI_OTG_CTRL);
                        if (ret) {
                                dev_err(dev, "unable to set CHRVBUS\n");
                                goto err_add;
@@ -297,7 +299,7 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
                pdata->exit(pdev);
        if (pdata->otg)
-                otg_shutdown(pdata->otg);
+                usb_phy_shutdown(pdata->otg);
        usb_remove_hcd(hcd);
        iounmap(hcd->regs);
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index dbc7fe8ca9e..3de48a2d795 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -35,7 +35,7 @@ struct tegra_ehci_hcd {
        struct tegra_usb_phy *phy;
        struct clk *clk;
        struct clk *emc_clk;
-        struct otg_transceiver *transceiver;
+        struct usb_phy *transceiver;
        int host_resumed;
        int bus_suspended;
        int port_resuming;
@@ -733,9 +733,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG_UTILS
        if (pdata->operating_mode == TEGRA_USB_OTG) {
-                tegra->transceiver = otg_get_transceiver();
+                tegra->transceiver = usb_get_transceiver();
                if (tegra->transceiver)
-                        otg_set_host(tegra->transceiver, &hcd->self);
+                        otg_set_host(tegra->transceiver->otg, &hcd->self);
        }
 #endif
@@ -750,8 +750,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 fail:
 #ifdef CONFIG_USB_OTG_UTILS
        if (tegra->transceiver) {
-                otg_set_host(tegra->transceiver, NULL);
+                otg_set_host(tegra->transceiver->otg, NULL);
-                otg_put_transceiver(tegra->transceiver);
+                usb_put_transceiver(tegra->transceiver);
        }
 #endif
        tegra_usb_phy_close(tegra->phy);
@@ -808,8 +808,8 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG_UTILS
        if (tegra->transceiver) {
-                otg_set_host(tegra->transceiver, NULL);
+                otg_set_host(tegra->transceiver->otg, NULL);
-                otg_put_transceiver(tegra->transceiver);
+                usb_put_transceiver(tegra->transceiver);
        }
 #endif
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 0a5fda73b3f..8f9acbc96fd 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -176,7 +176,7 @@ struct ehci_hcd {			/* one per controller */
        /*
         * OTG controllers and transceivers need software interaction
         */
-        struct otg_transceiver  *transceiver;
+        struct usb_phy  *transceiver;
 };
 /* convert between an HCD pointer and the corresponding EHCI_HCD */
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index db3968656d2..96451e41ee8 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -171,7 +171,7 @@ static void start_hnp(struct ohci_hcd *ohci)
        unsigned long   flags;
        u32 l;
-        otg_start_hnp(ohci->transceiver);
+        otg_start_hnp(ohci->transceiver->otg);
        local_irq_save(flags);
        ohci->transceiver->state = OTG_STATE_A_SUSPEND;
@@ -210,9 +210,9 @@ static int ohci_omap_init(struct usb_hcd *hcd)
 #ifdef  CONFIG_USB_OTG
        if (need_transceiver) {
-                ohci->transceiver = otg_get_transceiver();
+                ohci->transceiver = usb_get_transceiver();
                if (ohci->transceiver) {
-                        int     status = otg_set_host(ohci->transceiver,
+                        int     status = otg_set_host(ohci->transceiver->otg,
                                                &ohci_to_hcd(ohci)->self);
                        dev_dbg(hcd->self.controller, "init %s transceiver, status %d\n",
                                        ohci->transceiver->label, status);
@@ -404,7 +404,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
        usb_remove_hcd(hcd);
        if (ohci->transceiver) {
-                (void) otg_set_host(ohci->transceiver, 0);
+                (void) otg_set_host(ohci->transceiver->otg, 0);
                put_device(ohci->transceiver->dev);
        }
        if (machine_is_omap_osk())
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 8ff6f7ea96f..1b19aea25a2 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -376,7 +376,7 @@ struct ohci_hcd {
         * OTG controllers and transceivers need software interaction;
         * other external transceivers should be software-transparent
         */
-        struct otg_transceiver  *transceiver;
+        struct usb_phy  *transceiver;
        void (*start_hnp)(struct ohci_hcd *ohci);
        /*
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 5285bda1dc4..9f3eda91ea4 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -226,6 +226,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
        struct device *dev = musb->controller;
        struct musb_hdrc_platform_data *plat = dev->platform_data;
        struct omap_musb_board_data *data = plat->board_data;
+        struct usb_otg *otg = musb->xceiv->otg;
        unsigned long flags;
        irqreturn_t ret = IRQ_NONE;
        u32 epintr, usbintr;
@@ -289,14 +290,14 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
                        WARNING("VBUS error workaround (delay coming)\n");
                } else if (is_host_enabled(musb) && drvvbus) {
                        MUSB_HST_MODE(musb);
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                        musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                        portstate(musb->port1_status |= USB_PORT_STAT_POWER);
                        del_timer(&otg_workaround);
                } else {
                        musb->is_active = 0;
                        MUSB_DEV_MODE(musb);
-                        musb->xceiv->default_a = 0;
+                        otg->default_a = 0;
                        musb->xceiv->state = OTG_STATE_B_IDLE;
                        portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);
                }
@@ -363,7 +364,7 @@ static int am35x_musb_init(struct musb *musb)
                return -ENODEV;
        usb_nop_xceiv_register();
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv)
                return -ENODEV;
@@ -405,7 +406,7 @@ static int am35x_musb_exit(struct musb *musb)
        if (data->set_phy_power)
                data->set_phy_power(0);
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 261af3487b5..a087ed6c3be 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -317,7 +317,7 @@ static void bfin_musb_set_vbus(struct musb *musb, int is_on)
                musb_readb(musb->mregs, MUSB_DEVCTL));
 }
-static int bfin_musb_set_power(struct otg_transceiver *x, unsigned mA)
+static int bfin_musb_set_power(struct usb_phy *x, unsigned mA)
 {
        return 0;
 }
@@ -415,7 +415,7 @@ static int bfin_musb_init(struct musb *musb)
        gpio_direction_output(musb->config->gpio_vrsel, 0);
        usb_nop_xceiv_register();
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv) {
                gpio_free(musb->config->gpio_vrsel);
                return -ENODEV;
@@ -440,7 +440,7 @@ static int bfin_musb_exit(struct musb *musb)
 {
        gpio_free(musb->config->gpio_vrsel);
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
 }
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 01c8f2ece08..8bd9566f3fb 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -294,6 +294,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
 {
        struct musb             *musb = hci;
        void __iomem            *reg_base = musb->ctrl_base;
+        struct usb_otg          *otg = musb->xceiv->otg;
        unsigned long           flags;
        irqreturn_t             ret = IRQ_NONE;
        u32                     status;
@@ -351,14 +352,14 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
                        WARNING("VBUS error workaround (delay coming)\n");
                } else if (is_host_enabled(musb) && drvvbus) {
                        MUSB_HST_MODE(musb);
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                        musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                        portstate(musb->port1_status |= USB_PORT_STAT_POWER);
                        del_timer(&otg_workaround);
                } else {
                        musb->is_active = 0;
                        MUSB_DEV_MODE(musb);
-                        musb->xceiv->default_a = 0;
+                        otg->default_a = 0;
                        musb->xceiv->state = OTG_STATE_B_IDLE;
                        portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);
                }
@@ -424,7 +425,7 @@ static int da8xx_musb_init(struct musb *musb)
                goto fail;
        usb_nop_xceiv_register();
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv)
                goto fail;
@@ -457,7 +458,7 @@ static int da8xx_musb_exit(struct musb *musb)
        phy_off();
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 0ba3e75285c..97ab975fa44 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -265,6 +265,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
        unsigned long   flags;
        irqreturn_t     retval = IRQ_NONE;
        struct musb     *musb = __hci;
+        struct usb_otg  *otg = musb->xceiv->otg;
        void __iomem    *tibase = musb->ctrl_base;
        struct cppi     *cppi;
        u32             tmp;
@@ -331,14 +332,14 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
                        WARNING("VBUS error workaround (delay coming)\n");
                } else if (is_host_enabled(musb) && drvvbus) {
                        MUSB_HST_MODE(musb);
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                        musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                        portstate(musb->port1_status |= USB_PORT_STAT_POWER);
                        del_timer(&otg_workaround);
                } else {
                        musb->is_active = 0;
                        MUSB_DEV_MODE(musb);
-                        musb->xceiv->default_a = 0;
+                        otg->default_a = 0;
                        musb->xceiv->state = OTG_STATE_B_IDLE;
                        portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);
                }
@@ -383,7 +384,7 @@ static int davinci_musb_init(struct musb *musb)
        u32             revision;
        usb_nop_xceiv_register();
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv)
                return -ENODEV;
@@ -442,7 +443,7 @@ static int davinci_musb_init(struct musb *musb)
        return 0;
 fail:
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        usb_nop_xceiv_unregister();
        return -ENODEV;
 }
@@ -464,7 +465,7 @@ static int davinci_musb_exit(struct musb *musb)
        davinci_musb_source_power(musb, 0 /*off*/, 1);
        /* delay, to avoid problems with module reload */
-        if (is_host_enabled(musb) && musb->xceiv->default_a) {
+        if (is_host_enabled(musb) && musb->xceiv->otg->default_a) {
                int     maxdelay = 30;
                u8      devctl, warn = 0;
@@ -491,7 +492,7 @@ static int davinci_musb_exit(struct musb *musb)
        phy_off();
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3746fff628b..b527e9e6dba 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -131,9 +131,9 @@ static inline struct musb *dev_to_musb(struct device *dev)
 /*-------------------------------------------------------------------------*/
 #ifndef CONFIG_BLACKFIN
-static int musb_ulpi_read(struct otg_transceiver *otg, u32 offset)
+static int musb_ulpi_read(struct usb_phy *phy, u32 offset)
 {
-        void __iomem *addr = otg->io_priv;
+        void __iomem *addr = phy->io_priv;
        int     i = 0;
        u8      r;
        u8      power;
@@ -165,10 +165,9 @@ static int musb_ulpi_read(struct otg_transceiver *otg, u32 offset)
        return musb_readb(addr, MUSB_ULPI_REG_DATA);
 }
-static int musb_ulpi_write(struct otg_transceiver *otg,
+static int musb_ulpi_write(struct usb_phy *phy, u32 offset, u32 data)
-                u32 offset, u32 data)
 {
-        void __iomem *addr = otg->io_priv;
+        void __iomem *addr = phy->io_priv;
        int     i = 0;
        u8      r = 0;
        u8      power;
@@ -200,7 +199,7 @@ static int musb_ulpi_write(struct otg_transceiver *otg,
 #define musb_ulpi_write         NULL
 #endif
-static struct otg_io_access_ops musb_ulpi_access = {
+static struct usb_phy_io_ops musb_ulpi_access = {
        .read = musb_ulpi_read,
        .write = musb_ulpi_write,
 };
@@ -414,6 +413,7 @@ void musb_hnp_stop(struct musb *musb)
 static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                                u8 devctl, u8 power)
 {
+        struct usb_otg *otg = musb->xceiv->otg;
        irqreturn_t handled = IRQ_NONE;
        dev_dbg(musb->controller, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl,
@@ -626,7 +626,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                case OTG_STATE_B_PERIPHERAL:
                        musb_g_suspend(musb);
                        musb->is_active = is_otg_enabled(musb)
-                                        && musb->xceiv->gadget->b_hnp_enable;
+                                        && otg->gadget->b_hnp_enable;
                        if (musb->is_active) {
                                musb->xceiv->state = OTG_STATE_B_WAIT_ACON;
                                dev_dbg(musb->controller, "HNP: Setting timer for b_ase0_brst\n");
@@ -643,7 +643,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                case OTG_STATE_A_HOST:
                        musb->xceiv->state = OTG_STATE_A_SUSPEND;
                        musb->is_active = is_otg_enabled(musb)
-                                        && musb->xceiv->host->b_hnp_enable;
+                                        && otg->host->b_hnp_enable;
                        break;
                case OTG_STATE_B_HOST:
                        /* Transition to B_PERIPHERAL, see 6.8.2.6 p 44 */
@@ -1961,11 +1961,11 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
        if (is_host_enabled(musb)) {
                struct usb_hcd  *hcd = musb_to_hcd(musb);
-                otg_set_host(musb->xceiv, &hcd->self);
+                otg_set_host(musb->xceiv->otg, &hcd->self);
                if (is_otg_enabled(musb))
                        hcd->self.otg_port = 1;
-                musb->xceiv->host = &hcd->self;
+                musb->xceiv->otg->host = &hcd->self;
                hcd->power_budget = 2 * (plat->power ? : 250);
                /* program PHY to use external vBus if required */
@@ -1984,7 +1984,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                struct usb_hcd  *hcd = musb_to_hcd(musb);
                MUSB_HST_MODE(musb);
-                musb->xceiv->default_a = 1;
+                musb->xceiv->otg->default_a = 1;
                musb->xceiv->state = OTG_STATE_A_IDLE;
                status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
@@ -1999,7 +1999,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
        } else /* peripheral is enabled */ {
                MUSB_DEV_MODE(musb);
-                musb->xceiv->default_a = 0;
+                musb->xceiv->otg->default_a = 0;
                musb->xceiv->state = OTG_STATE_B_IDLE;
                status = musb_gadget_setup(musb);
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 3d28fb8a2dc..93de517a32a 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -372,7 +372,7 @@ struct musb {
        u16                     int_rx;
        u16                     int_tx;
-        struct otg_transceiver  *xceiv;
+        struct usb_phy          *xceiv;
        u8                      xceiv_event;
        int nIrq;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 957d9ca3d06..a495a3079c0 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1642,7 +1642,7 @@ static int musb_gadget_wakeup(struct usb_gadget *gadget)
                }
                spin_unlock_irqrestore(&musb->lock, flags);
-                otg_start_srp(musb->xceiv);
+                otg_start_srp(musb->xceiv->otg);
                spin_lock_irqsave(&musb->lock, flags);
                /* Block idling for at least 1s */
@@ -1721,7 +1721,7 @@ static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA)
        if (!musb->xceiv->set_power)
                return -EOPNOTSUPP;
-        return otg_set_power(musb->xceiv, mA);
+        return usb_phy_set_power(musb->xceiv, mA);
 }
 static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
@@ -1916,6 +1916,7 @@ static int musb_gadget_start(struct usb_gadget *g,
                struct usb_gadget_driver *driver)
 {
        struct musb             *musb = gadget_to_musb(g);
+        struct usb_otg          *otg = musb->xceiv->otg;
        unsigned long           flags;
        int                     retval = -EINVAL;
@@ -1932,7 +1933,7 @@ static int musb_gadget_start(struct usb_gadget *g,
        spin_lock_irqsave(&musb->lock, flags);
        musb->is_active = 1;
-        otg_set_peripheral(musb->xceiv, &musb->g);
+        otg_set_peripheral(otg, &musb->g);
        musb->xceiv->state = OTG_STATE_B_IDLE;
        /*
@@ -1963,8 +1964,8 @@ static int musb_gadget_start(struct usb_gadget *g,
                }
                if ((musb->xceiv->last_event == USB_EVENT_ID)
-                                        && musb->xceiv->set_vbus)
+                                        && otg->set_vbus)
-                        otg_set_vbus(musb->xceiv, 1);
+                        otg_set_vbus(otg, 1);
                hcd->self.uses_pio_for_control = 1;
        }
@@ -2046,7 +2047,7 @@ static int musb_gadget_stop(struct usb_gadget *g,
        musb->xceiv->state = OTG_STATE_UNDEFINED;
        stop_activity(musb, driver);
-        otg_set_peripheral(musb->xceiv, NULL);
+        otg_set_peripheral(musb->xceiv->otg, NULL);
        dev_dbg(musb->controller, "unregistering driver %s\n", driver->function);
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index e9f80adc45a..22ec3e37998 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -47,6 +47,7 @@
 static void musb_port_suspend(struct musb *musb, bool do_suspend)
 {
+        struct usb_otg  *otg = musb->xceiv->otg;
        u8              power;
        void __iomem    *mbase = musb->mregs;
@@ -81,7 +82,7 @@ static void musb_port_suspend(struct musb *musb, bool do_suspend)
                case OTG_STATE_A_HOST:
                        musb->xceiv->state = OTG_STATE_A_SUSPEND;
                        musb->is_active = is_otg_enabled(musb)
-                                        && musb->xceiv->host->b_hnp_enable;
+                                        && otg->host->b_hnp_enable;
                        if (musb->is_active)
                                mod_timer(&musb->otg_timer, jiffies
                                        + msecs_to_jiffies(
@@ -91,7 +92,7 @@ static void musb_port_suspend(struct musb *musb, bool do_suspend)
                case OTG_STATE_B_HOST:
                        musb->xceiv->state = OTG_STATE_B_WAIT_ACON;
                        musb->is_active = is_otg_enabled(musb)
-                                        && musb->xceiv->host->b_hnp_enable;
+                                        && otg->host->b_hnp_enable;
                        musb_platform_try_idle(musb, 0);
                        break;
                default:
@@ -179,6 +180,8 @@ static void musb_port_reset(struct musb *musb, bool do_reset)
 void musb_root_disconnect(struct musb *musb)
 {
+        struct usb_otg  *otg = musb->xceiv->otg;
        musb->port1_status = USB_PORT_STAT_POWER
                        | (USB_PORT_STAT_C_CONNECTION << 16);
@@ -188,7 +191,7 @@ void musb_root_disconnect(struct musb *musb)
        switch (musb->xceiv->state) {
        case OTG_STATE_A_SUSPEND:
                if (is_otg_enabled(musb)
-                                && musb->xceiv->host->b_hnp_enable) {
+                                && otg->host->b_hnp_enable) {
                        musb->xceiv->state = OTG_STATE_A_PERIPHERAL;
                        musb->g.is_a_peripheral = 1;
                        break;
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index da430c31ebe..2ae0bb30999 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -132,6 +132,7 @@ static void omap2430_musb_try_idle(struct musb *musb, unsigned long timeout)
 static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 {
+        struct usb_otg  *otg = musb->xceiv->otg;
        u8              devctl;
        unsigned long timeout = jiffies + msecs_to_jiffies(1000);
        int ret = 1;
@@ -163,11 +164,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                                }
                        }
-                        if (ret && musb->xceiv->set_vbus)
+                        if (ret && otg->set_vbus)
-                                otg_set_vbus(musb->xceiv, 1);
+                                otg_set_vbus(otg, 1);
                } else {
                        musb->is_active = 1;
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                        musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                        devctl |= MUSB_DEVCTL_SESSION;
                        MUSB_HST_MODE(musb);
@@ -179,7 +180,7 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                 * jumping right to B_IDLE...
                 */
-                musb->xceiv->default_a = 0;
+                otg->default_a = 0;
                musb->xceiv->state = OTG_STATE_B_IDLE;
                devctl &= ~MUSB_DEVCTL_SESSION;
@@ -246,7 +247,7 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
                if (!is_otg_enabled(musb) || musb->gadget_driver) {
                        pm_runtime_get_sync(musb->controller);
-                        otg_init(musb->xceiv);
+                        usb_phy_init(musb->xceiv);
                        omap2430_musb_set_vbus(musb, 1);
                }
                break;
@@ -256,7 +257,7 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
                if (musb->gadget_driver)
                        pm_runtime_get_sync(musb->controller);
-                otg_init(musb->xceiv);
+                usb_phy_init(musb->xceiv);
                break;
        case USB_EVENT_NONE:
@@ -269,10 +270,10 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
                        }
                if (data->interface_type == MUSB_INTERFACE_UTMI) {
-                        if (musb->xceiv->set_vbus)
+                        if (musb->xceiv->otg->set_vbus)
-                                otg_set_vbus(musb->xceiv, 0);
+                                otg_set_vbus(musb->xceiv->otg, 0);
                }
-                otg_shutdown(musb->xceiv);
+                usb_phy_shutdown(musb->xceiv);
                break;
        default:
                dev_dbg(musb->controller, "ID float\n");
@@ -290,7 +291,7 @@ static int omap2430_musb_init(struct musb *musb)
         * up through ULPI.  TWL4030-family PMICs include one,
         * which needs a driver, drivers aren't always needed.
         */
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv) {
                pr_err("HS USB OTG: no transceiver configured\n");
                return -ENODEV;
@@ -325,7 +326,7 @@ static int omap2430_musb_init(struct musb *musb)
                        musb_readl(musb->mregs, OTG_SIMENABLE));
        musb->nb.notifier_call = musb_otg_notifications;
-        status = otg_register_notifier(musb->xceiv, &musb->nb);
+        status = usb_register_notifier(musb->xceiv, &musb->nb);
        if (status)
                dev_dbg(musb->controller, "notification register failed\n");
@@ -349,7 +350,7 @@ static void omap2430_musb_enable(struct musb *musb)
        switch (musb->xceiv->last_event) {
        case USB_EVENT_ID:
-                otg_init(musb->xceiv);
+                usb_phy_init(musb->xceiv);
                if (data->interface_type != MUSB_INTERFACE_UTMI)
                        break;
                devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
@@ -368,7 +369,7 @@ static void omap2430_musb_enable(struct musb *musb)
                break;
        case USB_EVENT_VBUS:
-                otg_init(musb->xceiv);
+                usb_phy_init(musb->xceiv);
                break;
        default:
@@ -379,7 +380,7 @@ static void omap2430_musb_enable(struct musb *musb)
 static void omap2430_musb_disable(struct musb *musb)
 {
        if (musb->xceiv->last_event)
-                otg_shutdown(musb->xceiv);
+                usb_phy_shutdown(musb->xceiv);
 }
 static int omap2430_musb_exit(struct musb *musb)
@@ -388,7 +389,7 @@ static int omap2430_musb_exit(struct musb *musb)
        cancel_work_sync(&musb->otg_notifier_work);
        omap2430_low_level_exit(musb);
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        return 0;
 }
@@ -494,7 +495,7 @@ static int omap2430_runtime_suspend(struct device *dev)
                                                OTG_INTERFSEL);
        omap2430_low_level_exit(musb);
-        otg_set_suspend(musb->xceiv, 1);
+        usb_phy_set_suspend(musb->xceiv, 1);
        return 0;
 }
@@ -508,7 +509,7 @@ static int omap2430_runtime_resume(struct device *dev)
        musb_writel(musb->mregs, OTG_INTERFSEL,
                                        musb->context.otg_interfsel);
-        otg_set_suspend(musb->xceiv, 0);
+        usb_phy_set_suspend(musb->xceiv, 0);
        return 0;
 }
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index b387f12d05b..de1355946a8 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -277,7 +277,7 @@ static struct musb *the_musb;
 * mode), or low power Default-B sessions, something else supplies power.
 * Caller must take care of locking.
 */
-static int tusb_draw_power(struct otg_transceiver *x, unsigned mA)
+static int tusb_draw_power(struct usb_phy *x, unsigned mA)
 {
        struct musb     *musb = the_musb;
        void __iomem    *tbase = musb->ctrl_base;
@@ -293,7 +293,7 @@ static int tusb_draw_power(struct otg_transceiver *x, unsigned mA)
         * The actual current usage would be very board-specific.  For now,
         * it's simpler to just use an aggregate (also board-specific).
         */
-        if (x->default_a || mA < (musb->min_power << 1))
+        if (x->otg->default_a || mA < (musb->min_power << 1))
                mA = 0;
        reg = musb_readl(tbase, TUSB_PRCM_MNGMT);
@@ -510,6 +510,7 @@ static void tusb_musb_set_vbus(struct musb *musb, int is_on)
        void __iomem    *tbase = musb->ctrl_base;
        u32             conf, prcm, timer;
        u8              devctl;
+        struct usb_otg  *otg = musb->xceiv->otg;
        /* HDRC controls CPEN, but beware current surges during device
         * connect.  They can trigger transient overcurrent conditions
@@ -522,7 +523,7 @@ static void tusb_musb_set_vbus(struct musb *musb, int is_on)
        if (is_on) {
                timer = OTG_TIMER_MS(OTG_TIME_A_WAIT_VRISE);
-                musb->xceiv->default_a = 1;
+                otg->default_a = 1;
                musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                devctl |= MUSB_DEVCTL_SESSION;
@@ -548,11 +549,11 @@ static void tusb_musb_set_vbus(struct musb *musb, int is_on)
                                musb->xceiv->state = OTG_STATE_A_IDLE;
                        }
                        musb->is_active = 0;
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                        MUSB_HST_MODE(musb);
                } else {
                        musb->is_active = 0;
-                        musb->xceiv->default_a = 0;
+                        otg->default_a = 0;
                        musb->xceiv->state = OTG_STATE_B_IDLE;
                        MUSB_DEV_MODE(musb);
                }
@@ -644,6 +645,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
 {
        u32             otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT);
        unsigned long   idle_timeout = 0;
+        struct usb_otg  *otg = musb->xceiv->otg;
        /* ID pin */
        if ((int_src & TUSB_INT_SRC_ID_STATUS_CHNG)) {
@@ -654,7 +656,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
                else
                        default_a = is_host_enabled(musb);
                dev_dbg(musb->controller, "Default-%c\n", default_a ? 'A' : 'B');
-                musb->xceiv->default_a = default_a;
+                otg->default_a = default_a;
                tusb_musb_set_vbus(musb, default_a);
                /* Don't allow idling immediately */
@@ -666,7 +668,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
        if (int_src & TUSB_INT_SRC_VBUS_SENSE_CHNG) {
                /* B-dev state machine:  no vbus ~= disconnect */
-                if ((is_otg_enabled(musb) && !musb->xceiv->default_a)
+                if ((is_otg_enabled(musb) && !otg->default_a)
                                || !is_host_enabled(musb)) {
                        /* ? musb_root_disconnect(musb); */
                        musb->port1_status &=
@@ -1076,7 +1078,7 @@ static int tusb_musb_init(struct musb *musb)
        int                     ret;
        usb_nop_xceiv_register();
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv)
                return -ENODEV;
@@ -1128,7 +1130,7 @@ done:
                if (sync)
                        iounmap(sync);
-                otg_put_transceiver(musb->xceiv);
+                usb_put_transceiver(musb->xceiv);
                usb_nop_xceiv_unregister();
        }
        return ret;
@@ -1144,7 +1146,7 @@ static int tusb_musb_exit(struct musb *musb)
        iounmap(musb->sync_va);
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
 }
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index bcfc48f4854..aa09dd417b9 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -37,7 +37,7 @@ struct ux500_glue {
 static int ux500_musb_init(struct musb *musb)
 {
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
        if (!musb->xceiv) {
                pr_err("HS USB OTG: no transceiver configured\n");
                return -ENODEV;
@@ -48,7 +48,7 @@ static int ux500_musb_init(struct musb *musb)
 static int ux500_musb_exit(struct musb *musb)
 {
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
        return 0;
 }
@@ -160,7 +160,7 @@ static int ux500_suspend(struct device *dev)
        struct ux500_glue       *glue = dev_get_drvdata(dev);
        struct musb             *musb = glue_to_musb(glue);
-        otg_set_suspend(musb->xceiv, 1);
+        usb_phy_set_suspend(musb->xceiv, 1);
        clk_disable(glue->clk);
        return 0;
@@ -178,7 +178,7 @@ static int ux500_resume(struct device *dev)
                return ret;
        }
-        otg_set_suspend(musb->xceiv, 0);
+        usb_phy_set_suspend(musb->xceiv, 0);
        return 0;
 }
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 735ef4c2339..5c87db06b59 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -23,7 +23,7 @@ config USB_GPIO_VBUS
        select USB_OTG_UTILS
        help
          Provides simple GPIO VBUS sensing for controllers with an
-          internal transceiver via the otg_transceiver interface, and
+          internal transceiver via the usb_phy interface, and
          optionally control of a D+ pullup GPIO as well as a VBUS
          current limit regulator.
diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c
index 74fe6e62e0f..e6371ff5f58 100644
--- a/drivers/usb/otg/ab8500-usb.c
+++ b/drivers/usb/otg/ab8500-usb.c
@@ -68,7 +68,7 @@ enum ab8500_usb_link_status {
 };
 struct ab8500_usb {
-        struct otg_transceiver otg;
+        struct usb_phy phy;
        struct device *dev;
        int irq_num_id_rise;
        int irq_num_id_fall;
@@ -82,9 +82,9 @@ struct ab8500_usb {
        int rev;
 };
-static inline struct ab8500_usb *xceiv_to_ab(struct otg_transceiver *x)
+static inline struct ab8500_usb *phy_to_ab(struct usb_phy *x)
 {
-        return container_of(x, struct ab8500_usb, otg);
+        return container_of(x, struct ab8500_usb, phy);
 }
 static void ab8500_usb_wd_workaround(struct ab8500_usb *ab)
@@ -153,7 +153,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab)
        u8 reg;
        enum ab8500_usb_link_status lsts;
        void *v = NULL;
-        enum usb_xceiv_events event;
+        enum usb_phy_events event;
        abx500_get_register_interruptible(ab->dev,
                        AB8500_USB,
@@ -169,8 +169,8 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab)
                /* TODO: Disable regulators. */
                ab8500_usb_host_phy_dis(ab);
                ab8500_usb_peri_phy_dis(ab);
-                ab->otg.state = OTG_STATE_B_IDLE;
+                ab->phy.state = OTG_STATE_B_IDLE;
-                ab->otg.default_a = false;
+                ab->phy.otg->default_a = false;
                ab->vbus_draw = 0;
                event = USB_EVENT_NONE;
                break;
@@ -181,22 +181,22 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab)
        case USB_LINK_HOST_CHG_NM:
        case USB_LINK_HOST_CHG_HS:
        case USB_LINK_HOST_CHG_HS_CHIRP:
-                if (ab->otg.gadget) {
+                if (ab->phy.otg->gadget) {
                        /* TODO: Enable regulators. */
                        ab8500_usb_peri_phy_en(ab);
-                        v = ab->otg.gadget;
+                        v = ab->phy.otg->gadget;
                }
                event = USB_EVENT_VBUS;
                break;
        case USB_LINK_HM_IDGND:
-                if (ab->otg.host) {
+                if (ab->phy.otg->host) {
                        /* TODO: Enable regulators. */
                        ab8500_usb_host_phy_en(ab);
-                        v = ab->otg.host;
+                        v = ab->phy.otg->host;
                }
-                ab->otg.state = OTG_STATE_A_IDLE;
+                ab->phy.state = OTG_STATE_A_IDLE;
-                ab->otg.default_a = true;
+                ab->phy.otg->default_a = true;
                event = USB_EVENT_ID;
                break;
@@ -212,7 +212,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab)
                break;
        }
-        atomic_notifier_call_chain(&ab->otg.notifier, event, v);
+        atomic_notifier_call_chain(&ab->phy.notifier, event, v);
        return 0;
 }
@@ -262,27 +262,27 @@ static void ab8500_usb_phy_disable_work(struct work_struct *work)
        struct ab8500_usb *ab = container_of(work, struct ab8500_usb,
                                                phy_dis_work);
-        if (!ab->otg.host)
+        if (!ab->phy.otg->host)
                ab8500_usb_host_phy_dis(ab);
-        if (!ab->otg.gadget)
+        if (!ab->phy.otg->gadget)
                ab8500_usb_peri_phy_dis(ab);
 }
-static int ab8500_usb_set_power(struct otg_transceiver *otg, unsigned mA)
+static int ab8500_usb_set_power(struct usb_phy *phy, unsigned mA)
 {
        struct ab8500_usb *ab;
-        if (!otg)
+        if (!phy)
                return -ENODEV;
-        ab = xceiv_to_ab(otg);
+        ab = phy_to_ab(phy);
        ab->vbus_draw = mA;
        if (mA)
-                atomic_notifier_call_chain(&ab->otg.notifier,
+                atomic_notifier_call_chain(&ab->phy.notifier,
-                                USB_EVENT_ENUMERATED, ab->otg.gadget);
+                                USB_EVENT_ENUMERATED, ab->phy.otg->gadget);
        return 0;
 }
@@ -290,21 +290,21 @@ static int ab8500_usb_set_power(struct otg_transceiver *otg, unsigned mA)
 * ab->vbus_draw.
 */
-static int ab8500_usb_set_suspend(struct otg_transceiver *x, int suspend)
+static int ab8500_usb_set_suspend(struct usb_phy *x, int suspend)
 {
        /* TODO */
        return 0;
 }
-static int ab8500_usb_set_peripheral(struct otg_transceiver *otg,
+static int ab8500_usb_set_peripheral(struct usb_otg *otg,
-                struct usb_gadget *gadget)
+                                        struct usb_gadget *gadget)
 {
        struct ab8500_usb *ab;
        if (!otg)
                return -ENODEV;
-        ab = xceiv_to_ab(otg);
+        ab = phy_to_ab(otg->phy);
        /* Some drivers call this function in atomic context.
         * Do not update ab8500 registers directly till this
@@ -313,11 +313,11 @@ static int ab8500_usb_set_peripheral(struct otg_transceiver *otg,
        if (!gadget) {
                /* TODO: Disable regulators. */
-                ab->otg.gadget = NULL;
+                otg->gadget = NULL;
                schedule_work(&ab->phy_dis_work);
        } else {
-                ab->otg.gadget = gadget;
+                otg->gadget = gadget;
-                ab->otg.state = OTG_STATE_B_IDLE;
+                otg->phy->state = OTG_STATE_B_IDLE;
                /* Phy will not be enabled if cable is already
                 * plugged-in. Schedule to enable phy.
@@ -329,15 +329,14 @@ static int ab8500_usb_set_peripheral(struct otg_transceiver *otg,
        return 0;
 }
-static int ab8500_usb_set_host(struct otg_transceiver *otg,
+static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
-                                        struct usb_bus *host)
 {
        struct ab8500_usb *ab;
        if (!otg)
                return -ENODEV;
-        ab = xceiv_to_ab(otg);
+        ab = phy_to_ab(otg->phy);
        /* Some drivers call this function in atomic context.
         * Do not update ab8500 registers directly till this
@@ -346,10 +345,10 @@ static int ab8500_usb_set_host(struct otg_transceiver *otg,
        if (!host) {
                /* TODO: Disable regulators. */
-                ab->otg.host = NULL;
+                otg->host = NULL;
                schedule_work(&ab->phy_dis_work);
        } else {
-                ab->otg.host = host;
+                otg->host = host;
                /* Phy will not be enabled if cable is already
                 * plugged-in. Schedule to enable phy.
                 * Use same delay to avoid any race condition.
@@ -472,6 +471,7 @@ static int ab8500_usb_v2_res_setup(struct platform_device *pdev,
 static int __devinit ab8500_usb_probe(struct platform_device *pdev)
 {
        struct ab8500_usb       *ab;
+        struct usb_otg          *otg;
        int err;
        int rev;
@@ -488,19 +488,28 @@ static int __devinit ab8500_usb_probe(struct platform_device *pdev)
        if (!ab)
                return -ENOMEM;
+        otg = kzalloc(sizeof *otg, GFP_KERNEL);
+        if (!ab->phy.otg) {
+                kfree(ab);
+                return -ENOMEM;
+        }
        ab->dev                 = &pdev->dev;
        ab->rev                 = rev;
-        ab->otg.dev             = ab->dev;
+        ab->phy.dev             = ab->dev;
-        ab->otg.label           = "ab8500";
+        ab->phy.otg             = otg;
-        ab->otg.state           = OTG_STATE_UNDEFINED;
+        ab->phy.label           = "ab8500";
-        ab->otg.set_host        = ab8500_usb_set_host;
+        ab->phy.set_suspend     = ab8500_usb_set_suspend;
-        ab->otg.set_peripheral  = ab8500_usb_set_peripheral;
+        ab->phy.set_power       = ab8500_usb_set_power;
-        ab->otg.set_suspend     = ab8500_usb_set_suspend;
+        ab->phy.state           = OTG_STATE_UNDEFINED;
-        ab->otg.set_power       = ab8500_usb_set_power;
+        otg->phy                = &ab->phy;
+        otg->set_host           = ab8500_usb_set_host;
+        otg->set_peripheral     = ab8500_usb_set_peripheral;
        platform_set_drvdata(pdev, ab);
-        ATOMIC_INIT_NOTIFIER_HEAD(&ab->otg.notifier);
+        ATOMIC_INIT_NOTIFIER_HEAD(&ab->phy.notifier);
        /* v1: Wait for link status to become stable.
         * all: Updates form set_host and set_peripheral as they are atomic.
@@ -520,7 +529,7 @@ static int __devinit ab8500_usb_probe(struct platform_device *pdev)
        if (err < 0)
                goto fail0;
-        err = otg_set_transceiver(&ab->otg);
+        err = usb_set_transceiver(&ab->phy);
        if (err) {
                dev_err(&pdev->dev, "Can't register transceiver\n");
                goto fail1;
@@ -532,6 +541,7 @@ static int __devinit ab8500_usb_probe(struct platform_device *pdev)
 fail1:
        ab8500_usb_irq_free(ab);
 fail0:
+        kfree(otg);
        kfree(ab);
        return err;
 }
@@ -546,13 +556,14 @@ static int __devexit ab8500_usb_remove(struct platform_device *pdev)
        cancel_work_sync(&ab->phy_dis_work);
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
        ab8500_usb_host_phy_dis(ab);
        ab8500_usb_peri_phy_dis(ab);
        platform_set_drvdata(pdev, NULL);
+        kfree(ab->phy.otg);
        kfree(ab);
        return 0;
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index a190850d2d3..be4a63e8302 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -275,7 +275,7 @@ void b_srp_end(unsigned long foo)
        fsl_otg_dischrg_vbus(0);
        srp_wait_done = 1;
-        if ((fsl_otg_dev->otg.state == OTG_STATE_B_SRP_INIT) &&
+        if ((fsl_otg_dev->phy.state == OTG_STATE_B_SRP_INIT) &&
            fsl_otg_dev->fsm.b_sess_vld)
                fsl_otg_dev->fsm.b_srp_done = 1;
 }
@@ -288,7 +288,7 @@ void b_srp_end(unsigned long foo)
 void a_wait_enum(unsigned long foo)
 {
        VDBG("a_wait_enum timeout\n");
-        if (!fsl_otg_dev->otg.host->b_hnp_enable)
+        if (!fsl_otg_dev->phy.otg->host->b_hnp_enable)
                fsl_otg_add_timer(a_wait_enum_tmr);
        else
                otg_statemachine(&fsl_otg_dev->fsm);
@@ -452,14 +452,14 @@ void otg_reset_controller(void)
 /* Call suspend/resume routines in host driver */
 int fsl_otg_start_host(struct otg_fsm *fsm, int on)
 {
-        struct otg_transceiver *xceiv = fsm->transceiver;
+        struct usb_otg *otg = fsm->otg;
        struct device *dev;
-        struct fsl_otg *otg_dev = container_of(xceiv, struct fsl_otg, otg);
+        struct fsl_otg *otg_dev = container_of(otg->phy, struct fsl_otg, phy);
        u32 retval = 0;
-        if (!xceiv->host)
+        if (!otg->host)
                return -ENODEV;
-        dev = xceiv->host->controller;
+        dev = otg->host->controller;
        /*
         * Update a_vbus_vld state as a_vbus_vld int is disabled
@@ -518,14 +518,14 @@ end:
 */
 int fsl_otg_start_gadget(struct otg_fsm *fsm, int on)
 {
-        struct otg_transceiver *xceiv = fsm->transceiver;
+        struct usb_otg *otg = fsm->otg;
        struct device *dev;
-        if (!xceiv->gadget || !xceiv->gadget->dev.parent)
+        if (!otg->gadget || !otg->gadget->dev.parent)
                return -ENODEV;
        VDBG("gadget %s\n", on ? "on" : "off");
-        dev = xceiv->gadget->dev.parent;
+        dev = otg->gadget->dev.parent;
        if (on) {
                if (dev->driver->resume)
@@ -542,14 +542,14 @@ int fsl_otg_start_gadget(struct otg_fsm *fsm, int on)
 * Called by initialization code of host driver.  Register host controller
 * to the OTG.  Suspend host for OTG role detection.
 */
-static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
+static int fsl_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
+        struct fsl_otg *otg_dev = container_of(otg->phy, struct fsl_otg, phy);
-        if (!otg_p || otg_dev != fsl_otg_dev)
+        if (!otg || otg_dev != fsl_otg_dev)
                return -ENODEV;
-        otg_p->host = host;
+        otg->host = host;
        otg_dev->fsm.a_bus_drop = 0;
        otg_dev->fsm.a_bus_req = 1;
@@ -557,8 +557,8 @@ static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
        if (host) {
                VDBG("host off......\n");
-                otg_p->host->otg_port = fsl_otg_initdata.otg_port;
+                otg->host->otg_port = fsl_otg_initdata.otg_port;
-                otg_p->host->is_b_host = otg_dev->fsm.id;
+                otg->host->is_b_host = otg_dev->fsm.id;
                /*
                 * must leave time for khubd to finish its thing
                 * before yanking the host driver out from under it,
@@ -574,7 +574,7 @@ static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
                        /* Mini-A cable connected */
                        struct otg_fsm *fsm = &otg_dev->fsm;
-                        otg_p->state = OTG_STATE_UNDEFINED;
+                        otg->phy->state = OTG_STATE_UNDEFINED;
                        fsm->protocol = PROTO_UNDEF;
                }
        }
@@ -587,29 +587,29 @@ static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
 }
 /* Called by initialization code of udc.  Register udc to OTG. */
-static int fsl_otg_set_peripheral(struct otg_transceiver *otg_p,
+static int fsl_otg_set_peripheral(struct usb_otg *otg,
-                                  struct usb_gadget *gadget)
+                                        struct usb_gadget *gadget)
 {
-        struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
+        struct fsl_otg *otg_dev = container_of(otg->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_p || otg_dev != fsl_otg_dev)
+        if (!otg || otg_dev != fsl_otg_dev)
                return -ENODEV;
        if (!gadget) {
-                if (!otg_dev->otg.default_a)
+                if (!otg->default_a)
-                        otg_p->gadget->ops->vbus_draw(otg_p->gadget, 0);
+                        otg->gadget->ops->vbus_draw(otg->gadget, 0);
-                usb_gadget_vbus_disconnect(otg_dev->otg.gadget);
+                usb_gadget_vbus_disconnect(otg->gadget);
-                otg_dev->otg.gadget = 0;
+                otg->gadget = 0;
                otg_dev->fsm.b_bus_req = 0;
                otg_statemachine(&otg_dev->fsm);
                return 0;
        }
-        otg_p->gadget = gadget;
+        otg->gadget = gadget;
-        otg_p->gadget->is_a_peripheral = !otg_dev->fsm.id;
+        otg->gadget->is_a_peripheral = !otg_dev->fsm.id;
        otg_dev->fsm.b_bus_req = 1;
@@ -625,11 +625,11 @@ static int fsl_otg_set_peripheral(struct otg_transceiver *otg_p,
 }
 /* Set OTG port power, only for B-device */
-static int fsl_otg_set_power(struct otg_transceiver *otg_p, unsigned mA)
+static int fsl_otg_set_power(struct usb_phy *phy, unsigned mA)
 {
        if (!fsl_otg_dev)
                return -ENODEV;
-        if (otg_p->state == OTG_STATE_B_PERIPHERAL)
+        if (phy->state == OTG_STATE_B_PERIPHERAL)
                pr_info("FSL OTG: Draw %d mA\n", mA);
        return 0;
@@ -658,12 +658,12 @@ static void fsl_otg_event(struct work_struct *work)
 }
 /* B-device start SRP */
-static int fsl_otg_start_srp(struct otg_transceiver *otg_p)
+static int fsl_otg_start_srp(struct usb_otg *otg)
 {
-        struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
+        struct fsl_otg *otg_dev = container_of(otg->phy, struct fsl_otg, phy);
-        if (!otg_p || otg_dev != fsl_otg_dev
+        if (!otg || otg_dev != fsl_otg_dev
-            || otg_p->state != OTG_STATE_B_IDLE)
+            || otg->phy->state != OTG_STATE_B_IDLE)
                return -ENODEV;
        otg_dev->fsm.b_bus_req = 1;
@@ -673,11 +673,11 @@ static int fsl_otg_start_srp(struct otg_transceiver *otg_p)
 }
 /* A_host suspend will call this function to start hnp */
-static int fsl_otg_start_hnp(struct otg_transceiver *otg_p)
+static int fsl_otg_start_hnp(struct usb_otg *otg)
 {
-        struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
+        struct fsl_otg *otg_dev = container_of(otg->phy, struct fsl_otg, phy);
-        if (!otg_p || otg_dev != fsl_otg_dev)
+        if (!otg || otg_dev != fsl_otg_dev)
                return -ENODEV;
        DBG("start_hnp...n");
@@ -698,7 +698,7 @@ static int fsl_otg_start_hnp(struct otg_transceiver *otg_p)
 irqreturn_t fsl_otg_isr(int irq, void *dev_id)
 {
        struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm;
-        struct otg_transceiver *otg = &((struct fsl_otg *)dev_id)->otg;
+        struct usb_otg *otg = ((struct fsl_otg *)dev_id)->phy.otg;
        u32 otg_int_src, otg_sc;
        otg_sc = fsl_readl(&usb_dr_regs->otgsc);
@@ -774,6 +774,12 @@ static int fsl_otg_conf(struct platform_device *pdev)
        if (!fsl_otg_tc)
                return -ENOMEM;
+        fsl_otg_tc->phy.otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
+        if (!fsl_otg_tc->phy.otg) {
+                kfree(fsl_otg_tc);
+                return -ENOMEM;
+        }
        INIT_DELAYED_WORK(&fsl_otg_tc->otg_event, fsl_otg_event);
        INIT_LIST_HEAD(&active_timers);
@@ -788,17 +794,19 @@ static int fsl_otg_conf(struct platform_device *pdev)
        fsl_otg_tc->fsm.ops = &fsl_otg_ops;
        /* initialize the otg structure */
-        fsl_otg_tc->otg.label = DRIVER_DESC;
+        fsl_otg_tc->phy.label = DRIVER_DESC;
-        fsl_otg_tc->otg.set_host = fsl_otg_set_host;
+        fsl_otg_tc->phy.set_power = fsl_otg_set_power;
-        fsl_otg_tc->otg.set_peripheral = fsl_otg_set_peripheral;
-        fsl_otg_tc->otg.set_power = fsl_otg_set_power;
+        fsl_otg_tc->phy.otg->phy = &fsl_otg_tc->phy;
-        fsl_otg_tc->otg.start_hnp = fsl_otg_start_hnp;
+        fsl_otg_tc->phy.otg->set_host = fsl_otg_set_host;
-        fsl_otg_tc->otg.start_srp = fsl_otg_start_srp;
+        fsl_otg_tc->phy.otg->set_peripheral = fsl_otg_set_peripheral;
+        fsl_otg_tc->phy.otg->start_hnp = fsl_otg_start_hnp;
+        fsl_otg_tc->phy.otg->start_srp = fsl_otg_start_srp;
        fsl_otg_dev = fsl_otg_tc;
        /* Store the otg transceiver */
-        status = otg_set_transceiver(&fsl_otg_tc->otg);
+        status = usb_set_transceiver(&fsl_otg_tc->phy);
        if (status) {
                pr_warn(FSL_OTG_NAME ": unable to register OTG transceiver.\n");
                goto err;
@@ -807,6 +815,7 @@ static int fsl_otg_conf(struct platform_device *pdev)
        return 0;
 err:
        fsl_otg_uninit_timers();
+        kfree(fsl_otg_tc->phy.otg);
        kfree(fsl_otg_tc);
        return status;
 }
@@ -815,19 +824,19 @@ err:
 int usb_otg_start(struct platform_device *pdev)
 {
        struct fsl_otg *p_otg;
-        struct otg_transceiver *otg_trans = otg_get_transceiver();
+        struct usb_phy *otg_trans = usb_get_transceiver();
        struct otg_fsm *fsm;
        int status;
        struct resource *res;
        u32 temp;
        struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-        p_otg = container_of(otg_trans, struct fsl_otg, otg);
+        p_otg = container_of(otg_trans, struct fsl_otg, phy);
        fsm = &p_otg->fsm;
        /* Initialize the state machine structure with default values */
        SET_OTG_STATE(otg_trans, OTG_STATE_UNDEFINED);
-        fsm->transceiver = &p_otg->otg;
+        fsm->otg = p_otg->phy.otg;
        /* We don't require predefined MEM/IRQ resource index */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -857,9 +866,10 @@ int usb_otg_start(struct platform_device *pdev)
        status = request_irq(p_otg->irq, fsl_otg_isr,
                                IRQF_SHARED, driver_name, p_otg);
        if (status) {
-                dev_dbg(p_otg->otg.dev, "can't get IRQ %d, error %d\n",
+                dev_dbg(p_otg->phy.dev, "can't get IRQ %d, error %d\n",
                        p_otg->irq, status);
                iounmap(p_otg->dr_mem_map);
+                kfree(p_otg->phy.otg);
                kfree(p_otg);
                return status;
        }
@@ -919,10 +929,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->otg.state = OTG_STATE_UNDEFINED;
+                p_otg->phy.state = OTG_STATE_UNDEFINED;
                p_otg->fsm.id = 1;
        } else {
-                p_otg->otg.state = OTG_STATE_A_IDLE;
+                p_otg->phy.state = OTG_STATE_A_IDLE;
                p_otg->fsm.id = 0;
        }
@@ -978,7 +988,7 @@ static int show_fsl_usb2_otg_state(struct device *dev,
        /* State */
        t = scnprintf(next, size,
                      "OTG state: %s\n\n",
-                      otg_state_string(fsl_otg_dev->otg.state));
+                      otg_state_string(fsl_otg_dev->phy.state));
        size -= t;
        next += t;
@@ -1124,12 +1134,13 @@ static int __devexit fsl_otg_remove(struct platform_device *pdev)
 {
        struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
        free_irq(fsl_otg_dev->irq, fsl_otg_dev);
        iounmap((void *)usb_dr_regs);
        fsl_otg_uninit_timers();
+        kfree(fsl_otg_dev->phy.otg);
        kfree(fsl_otg_dev);
        device_remove_file(&pdev->dev, &dev_attr_fsl_usb2_otg_state);
diff --git a/drivers/usb/otg/fsl_otg.h b/drivers/usb/otg/fsl_otg.h
index 3f8ef731aac..ca266280895 100644
--- a/drivers/usb/otg/fsl_otg.h
+++ b/drivers/usb/otg/fsl_otg.h
@@ -369,7 +369,7 @@ inline struct fsl_otg_timer *otg_timer_initializer
 }
 struct fsl_otg {
-        struct otg_transceiver otg;
+        struct usb_phy phy;
        struct otg_fsm fsm;
        struct usb_dr_mmap *dr_mem_map;
        struct delayed_work otg_event;
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index fb644c107de..3ece43a2e4c 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -32,7 +32,7 @@
 * Needs to be loaded before the UDC driver that will use it.
 */
 struct gpio_vbus_data {
-        struct otg_transceiver otg;
+        struct usb_phy          phy;
        struct device          *dev;
        struct regulator       *vbus_draw;
        int                     vbus_draw_enabled;
@@ -98,7 +98,7 @@ static void gpio_vbus_work(struct work_struct *work)
        struct gpio_vbus_mach_info *pdata = gpio_vbus->dev->platform_data;
        int gpio;
-        if (!gpio_vbus->otg.gadget)
+        if (!gpio_vbus->phy.otg->gadget)
                return;
        /* Peripheral controllers which manage the pullup themselves won't have
@@ -108,8 +108,8 @@ static void gpio_vbus_work(struct work_struct *work)
         */
        gpio = pdata->gpio_pullup;
        if (is_vbus_powered(pdata)) {
-                gpio_vbus->otg.state = OTG_STATE_B_PERIPHERAL;
+                gpio_vbus->phy.state = OTG_STATE_B_PERIPHERAL;
-                usb_gadget_vbus_connect(gpio_vbus->otg.gadget);
+                usb_gadget_vbus_connect(gpio_vbus->phy.otg->gadget);
                /* drawing a "unit load" is *always* OK, except for OTG */
                set_vbus_draw(gpio_vbus, 100);
@@ -124,8 +124,8 @@ static void gpio_vbus_work(struct work_struct *work)
                set_vbus_draw(gpio_vbus, 0);
-                usb_gadget_vbus_disconnect(gpio_vbus->otg.gadget);
+                usb_gadget_vbus_disconnect(gpio_vbus->phy.otg->gadget);
-                gpio_vbus->otg.state = OTG_STATE_B_IDLE;
+                gpio_vbus->phy.state = OTG_STATE_B_IDLE;
        }
 }
@@ -135,12 +135,13 @@ static irqreturn_t gpio_vbus_irq(int irq, void *data)
        struct platform_device *pdev = data;
        struct gpio_vbus_mach_info *pdata = pdev->dev.platform_data;
        struct gpio_vbus_data *gpio_vbus = platform_get_drvdata(pdev);
+        struct usb_otg *otg = gpio_vbus->phy.otg;
        dev_dbg(&pdev->dev, "VBUS %s (gadget: %s)\n",
                is_vbus_powered(pdata) ? "supplied" : "inactive",
-                gpio_vbus->otg.gadget ? gpio_vbus->otg.gadget->name : "none");
+                otg->gadget ? otg->gadget->name : "none");
-        if (gpio_vbus->otg.gadget)
+        if (otg->gadget)
                schedule_work(&gpio_vbus->work);
        return IRQ_HANDLED;
@@ -149,15 +150,15 @@ static irqreturn_t gpio_vbus_irq(int irq, void *data)
 /* OTG transceiver interface */
 /* bind/unbind the peripheral controller */
-static int gpio_vbus_set_peripheral(struct otg_transceiver *otg,
+static int gpio_vbus_set_peripheral(struct usb_otg *otg,
-                                struct usb_gadget *gadget)
+                                        struct usb_gadget *gadget)
 {
        struct gpio_vbus_data *gpio_vbus;
        struct gpio_vbus_mach_info *pdata;
        struct platform_device *pdev;
        int gpio, irq;
-        gpio_vbus = container_of(otg, struct gpio_vbus_data, otg);
+        gpio_vbus = container_of(otg->phy, struct gpio_vbus_data, phy);
        pdev = to_platform_device(gpio_vbus->dev);
        pdata = gpio_vbus->dev->platform_data;
        irq = gpio_to_irq(pdata->gpio_vbus);
@@ -174,7 +175,7 @@ static int gpio_vbus_set_peripheral(struct otg_transceiver *otg,
                set_vbus_draw(gpio_vbus, 0);
                usb_gadget_vbus_disconnect(otg->gadget);
-                otg->state = OTG_STATE_UNDEFINED;
+                otg->phy->state = OTG_STATE_UNDEFINED;
                otg->gadget = NULL;
                return 0;
@@ -189,23 +190,23 @@ static int gpio_vbus_set_peripheral(struct otg_transceiver *otg,
 }
 /* effective for B devices, ignored for A-peripheral */
-static int gpio_vbus_set_power(struct otg_transceiver *otg, unsigned mA)
+static int gpio_vbus_set_power(struct usb_phy *phy, unsigned mA)
 {
        struct gpio_vbus_data *gpio_vbus;
-        gpio_vbus = container_of(otg, struct gpio_vbus_data, otg);
+        gpio_vbus = container_of(phy, struct gpio_vbus_data, phy);
-        if (otg->state == OTG_STATE_B_PERIPHERAL)
+        if (phy->state == OTG_STATE_B_PERIPHERAL)
                set_vbus_draw(gpio_vbus, mA);
        return 0;
 }
 /* for non-OTG B devices: set/clear transceiver suspend mode */
-static int gpio_vbus_set_suspend(struct otg_transceiver *otg, int suspend)
+static int gpio_vbus_set_suspend(struct usb_phy *phy, int suspend)
 {
        struct gpio_vbus_data *gpio_vbus;
-        gpio_vbus = container_of(otg, struct gpio_vbus_data, otg);
+        gpio_vbus = container_of(phy, struct gpio_vbus_data, phy);
        /* draw max 0 mA from vbus in suspend mode; or the previously
         * recorded amount of current if not suspended
@@ -213,7 +214,7 @@ static int gpio_vbus_set_suspend(struct otg_transceiver *otg, int suspend)
         * NOTE: high powered configs (mA > 100) may draw up to 2.5 mA
         * if they're wake-enabled ... we don't handle that yet.
         */
-        return gpio_vbus_set_power(otg, suspend ? 0 : gpio_vbus->mA);
+        return gpio_vbus_set_power(phy, suspend ? 0 : gpio_vbus->mA);
 }
 /* platform driver interface */
@@ -233,13 +234,21 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
        if (!gpio_vbus)
                return -ENOMEM;
+        gpio_vbus->phy.otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
+        if (!gpio_vbus->phy.otg) {
+                kfree(gpio_vbus);
+                return -ENOMEM;
+        }
        platform_set_drvdata(pdev, gpio_vbus);
        gpio_vbus->dev = &pdev->dev;
-        gpio_vbus->otg.label = "gpio-vbus";
+        gpio_vbus->phy.label = "gpio-vbus";
-        gpio_vbus->otg.state = OTG_STATE_UNDEFINED;
+        gpio_vbus->phy.set_power = gpio_vbus_set_power;
-        gpio_vbus->otg.set_peripheral = gpio_vbus_set_peripheral;
+        gpio_vbus->phy.set_suspend = gpio_vbus_set_suspend;
-        gpio_vbus->otg.set_power = gpio_vbus_set_power;
+        gpio_vbus->phy.state = OTG_STATE_UNDEFINED;
-        gpio_vbus->otg.set_suspend = gpio_vbus_set_suspend;
+        gpio_vbus->phy.otg->phy = &gpio_vbus->phy;
+        gpio_vbus->phy.otg->set_peripheral = gpio_vbus_set_peripheral;
        err = gpio_request(gpio, "vbus_detect");
        if (err) {
@@ -288,7 +297,7 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
        }
        /* only active when a gadget is registered */
-        err = otg_set_transceiver(&gpio_vbus->otg);
+        err = usb_set_transceiver(&gpio_vbus->phy);
        if (err) {
                dev_err(&pdev->dev, "can't register transceiver, err: %d\n",
                        err);
@@ -304,6 +313,7 @@ err_irq:
        gpio_free(pdata->gpio_vbus);
 err_gpio:
        platform_set_drvdata(pdev, NULL);
+        kfree(gpio_vbus->phy.otg);
        kfree(gpio_vbus);
        return err;
 }
@@ -316,13 +326,14 @@ static int __exit gpio_vbus_remove(struct platform_device *pdev)
        regulator_put(gpio_vbus->vbus_draw);
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
        free_irq(gpio_to_irq(gpio), &pdev->dev);
        if (gpio_is_valid(pdata->gpio_pullup))
                gpio_free(pdata->gpio_pullup);
        gpio_free(gpio);
        platform_set_drvdata(pdev, NULL);
+        kfree(gpio_vbus->phy.otg);
        kfree(gpio_vbus);
        return 0;
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 8c86787c2f0..70cf5d7bca4 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -52,7 +52,7 @@ MODULE_DESCRIPTION("ISP1301 USB OTG Transceiver Driver");
 MODULE_LICENSE("GPL");
 struct isp1301 {
-        struct otg_transceiver  otg;
+        struct usb_phy          phy;
        struct i2c_client       *client;
        void                    (*i2c_release)(struct device *dev);
@@ -236,7 +236,7 @@ isp1301_clear_bits(struct isp1301 *isp, u8 reg, u8 bits)
 static inline const char *state_name(struct isp1301 *isp)
 {
-        return otg_state_string(isp->otg.state);
+        return otg_state_string(isp->phy.state);
 }
 /*-------------------------------------------------------------------------*/
@@ -251,7 +251,7 @@ static inline const char *state_name(struct isp1301 *isp)
 static void power_down(struct isp1301 *isp)
 {
-        isp->otg.state = OTG_STATE_UNDEFINED;
+        isp->phy.state = OTG_STATE_UNDEFINED;
        // isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN);
        isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND);
@@ -280,13 +280,13 @@ static int host_suspend(struct isp1301 *isp)
 #else
        struct device   *dev;
-        if (!isp->otg.host)
+        if (!isp->phy.otg->host)
                return -ENODEV;
        /* Currently ASSUMES only the OTG port matters;
         * other ports could be active...
         */
-        dev = isp->otg.host->controller;
+        dev = isp->phy.otg->host->controller;
        return dev->driver->suspend(dev, 3, 0);
 #endif
 }
@@ -298,20 +298,20 @@ static int host_resume(struct isp1301 *isp)
 #else
        struct device   *dev;
-        if (!isp->otg.host)
+        if (!isp->phy.otg->host)
                return -ENODEV;
-        dev = isp->otg.host->controller;
+        dev = isp->phy.otg->host->controller;
        return dev->driver->resume(dev, 0);
 #endif
 }
 static int gadget_suspend(struct isp1301 *isp)
 {
-        isp->otg.gadget->b_hnp_enable = 0;
+        isp->phy.otg->gadget->b_hnp_enable = 0;
-        isp->otg.gadget->a_hnp_support = 0;
+        isp->phy.otg->gadget->a_hnp_support = 0;
-        isp->otg.gadget->a_alt_hnp_support = 0;
+        isp->phy.otg->gadget->a_alt_hnp_support = 0;
-        return usb_gadget_vbus_disconnect(isp->otg.gadget);
+        return usb_gadget_vbus_disconnect(isp->phy.otg->gadget);
 }
 /*-------------------------------------------------------------------------*/
@@ -341,19 +341,19 @@ static void a_idle(struct isp1301 *isp, const char *tag)
 {
        u32 l;
-        if (isp->otg.state == OTG_STATE_A_IDLE)
+        if (isp->phy.state == OTG_STATE_A_IDLE)
                return;
-        isp->otg.default_a = 1;
+        isp->phy.otg->default_a = 1;
-        if (isp->otg.host) {
+        if (isp->phy.otg->host) {
-                isp->otg.host->is_b_host = 0;
+                isp->phy.otg->host->is_b_host = 0;
                host_suspend(isp);
        }
-        if (isp->otg.gadget) {
+        if (isp->phy.otg->gadget) {
-                isp->otg.gadget->is_a_peripheral = 1;
+                isp->phy.otg->gadget->is_a_peripheral = 1;
                gadget_suspend(isp);
        }
-        isp->otg.state = OTG_STATE_A_IDLE;
+        isp->phy.state = OTG_STATE_A_IDLE;
        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
        omap_writel(l, OTG_CTRL);
        isp->last_otg_ctrl = l;
@@ -365,19 +365,19 @@ static void b_idle(struct isp1301 *isp, const char *tag)
 {
        u32 l;
-        if (isp->otg.state == OTG_STATE_B_IDLE)
+        if (isp->phy.state == OTG_STATE_B_IDLE)
                return;
-        isp->otg.default_a = 0;
+        isp->phy.otg->default_a = 0;
-        if (isp->otg.host) {
+        if (isp->phy.otg->host) {
-                isp->otg.host->is_b_host = 1;
+                isp->phy.otg->host->is_b_host = 1;
                host_suspend(isp);
        }
-        if (isp->otg.gadget) {
+        if (isp->phy.otg->gadget) {
-                isp->otg.gadget->is_a_peripheral = 0;
+                isp->phy.otg->gadget->is_a_peripheral = 0;
                gadget_suspend(isp);
        }
-        isp->otg.state = OTG_STATE_B_IDLE;
+        isp->phy.state = OTG_STATE_B_IDLE;
        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
        omap_writel(l, OTG_CTRL);
        isp->last_otg_ctrl = l;
@@ -478,7 +478,7 @@ static void check_state(struct isp1301 *isp, const char *tag)
        default:
                break;
        }
-        if (isp->otg.state == state && !extra)
+        if (isp->phy.state == state && !extra)
                return;
        pr_debug("otg: %s FSM %s/%02x, %s, %06x\n", tag,
                otg_state_string(state), fsm, state_name(isp),
@@ -502,22 +502,23 @@ static void update_otg1(struct isp1301 *isp, u8 int_src)
        if (int_src & INTR_SESS_VLD)
                otg_ctrl |= OTG_ASESSVLD;
-        else if (isp->otg.state == OTG_STATE_A_WAIT_VFALL) {
+        else if (isp->phy.state == OTG_STATE_A_WAIT_VFALL) {
                a_idle(isp, "vfall");
                otg_ctrl &= ~OTG_CTRL_BITS;
        }
        if (int_src & INTR_VBUS_VLD)
                otg_ctrl |= OTG_VBUSVLD;
        if (int_src & INTR_ID_GND) {            /* default-A */
-                if (isp->otg.state == OTG_STATE_B_IDLE
+                if (isp->phy.state == OTG_STATE_B_IDLE
-                                || isp->otg.state == OTG_STATE_UNDEFINED) {
+                                || isp->phy.state
+                                        == OTG_STATE_UNDEFINED) {
                        a_idle(isp, "init");
                        return;
                }
        } else {                                /* default-B */
                otg_ctrl |= OTG_ID;
-                if (isp->otg.state == OTG_STATE_A_IDLE
+                if (isp->phy.state == OTG_STATE_A_IDLE
-                                || isp->otg.state == OTG_STATE_UNDEFINED) {
+                        || isp->phy.state == OTG_STATE_UNDEFINED) {
                        b_idle(isp, "init");
                        return;
                }
@@ -551,14 +552,14 @@ static void otg_update_isp(struct isp1301 *isp)
        isp->last_otg_ctrl = otg_ctrl;
        otg_ctrl = otg_ctrl & OTG_XCEIV_INPUTS;
-        switch (isp->otg.state) {
+        switch (isp->phy.state) {
        case OTG_STATE_B_IDLE:
        case OTG_STATE_B_PERIPHERAL:
        case OTG_STATE_B_SRP_INIT:
                if (!(otg_ctrl & OTG_PULLUP)) {
                        // if (otg_ctrl & OTG_B_HNPEN) {
-                        if (isp->otg.gadget->b_hnp_enable) {
+                        if (isp->phy.otg->gadget->b_hnp_enable) {
-                                isp->otg.state = OTG_STATE_B_WAIT_ACON;
+                                isp->phy.state = OTG_STATE_B_WAIT_ACON;
                                pr_debug("  --> b_wait_acon\n");
                        }
                        goto pulldown;
@@ -585,10 +586,10 @@ pulldown:
                else clr |= ISP; \
                } while (0)
-        if (!(isp->otg.host))
+        if (!(isp->phy.otg->host))
                otg_ctrl &= ~OTG_DRV_VBUS;
-        switch (isp->otg.state) {
+        switch (isp->phy.state) {
        case OTG_STATE_A_SUSPEND:
                if (otg_ctrl & OTG_DRV_VBUS) {
                        set |= OTG1_VBUS_DRV;
@@ -599,7 +600,7 @@ pulldown:
                /* FALLTHROUGH */
        case OTG_STATE_A_VBUS_ERR:
-                isp->otg.state = OTG_STATE_A_WAIT_VFALL;
+                isp->phy.state = OTG_STATE_A_WAIT_VFALL;
                pr_debug("  --> a_wait_vfall\n");
                /* FALLTHROUGH */
        case OTG_STATE_A_WAIT_VFALL:
@@ -608,7 +609,7 @@ pulldown:
                break;
        case OTG_STATE_A_IDLE:
                if (otg_ctrl & OTG_DRV_VBUS) {
-                        isp->otg.state = OTG_STATE_A_WAIT_VRISE;
+                        isp->phy.state = OTG_STATE_A_WAIT_VRISE;
                        pr_debug("  --> a_wait_vrise\n");
                }
                /* FALLTHROUGH */
@@ -628,17 +629,17 @@ pulldown:
        if (otg_change & OTG_PULLUP) {
                u32 l;
-                switch (isp->otg.state) {
+                switch (isp->phy.state) {
                case OTG_STATE_B_IDLE:
                        if (clr & OTG1_DP_PULLUP)
                                break;
-                        isp->otg.state = OTG_STATE_B_PERIPHERAL;
+                        isp->phy.state = OTG_STATE_B_PERIPHERAL;
                        pr_debug("  --> b_peripheral\n");
                        break;
                case OTG_STATE_A_SUSPEND:
                        if (clr & OTG1_DP_PULLUP)
                                break;
-                        isp->otg.state = OTG_STATE_A_PERIPHERAL;
+                        isp->phy.state = OTG_STATE_A_PERIPHERAL;
                        pr_debug("  --> a_peripheral\n");
                        break;
                default:
@@ -659,6 +660,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
        u32             otg_ctrl;
        int             ret = IRQ_NONE;
        struct isp1301  *isp = _isp;
+        struct usb_otg  *otg = isp->phy.otg;
        /* update ISP1301 transceiver from OTG controller */
        if (otg_irq & OPRT_CHG) {
@@ -675,7 +677,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                 * remote wakeup (SRP, normal) using their own timer
                 * to give "check cable and A-device" messages.
                 */
-                if (isp->otg.state == OTG_STATE_B_SRP_INIT)
+                if (isp->phy.state == OTG_STATE_B_SRP_INIT)
                        b_idle(isp, "srp_timeout");
                omap_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
@@ -693,7 +695,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                omap_writel(otg_ctrl, OTG_CTRL);
                /* subset of b_peripheral()... */
-                isp->otg.state = OTG_STATE_B_PERIPHERAL;
+                isp->phy.state = OTG_STATE_B_PERIPHERAL;
                pr_debug("  --> b_peripheral\n");
                omap_writew(B_HNP_FAIL, OTG_IRQ_SRC);
@@ -705,9 +707,9 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                                state_name(isp), omap_readl(OTG_CTRL));
                isp1301_defer_work(isp, WORK_UPDATE_OTG);
-                switch (isp->otg.state) {
+                switch (isp->phy.state) {
                case OTG_STATE_A_IDLE:
-                        if (!isp->otg.host)
+                        if (!otg->host)
                                break;
                        isp1301_defer_work(isp, WORK_HOST_RESUME);
                        otg_ctrl = omap_readl(OTG_CTRL);
@@ -736,7 +738,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                otg_ctrl |= OTG_BUSDROP;
                otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
                omap_writel(otg_ctrl, OTG_CTRL);
-                isp->otg.state = OTG_STATE_A_WAIT_VFALL;
+                isp->phy.state = OTG_STATE_A_WAIT_VFALL;
                omap_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
                ret = IRQ_HANDLED;
@@ -750,7 +752,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                otg_ctrl |= OTG_BUSDROP;
                otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
                omap_writel(otg_ctrl, OTG_CTRL);
-                isp->otg.state = OTG_STATE_A_VBUS_ERR;
+                isp->phy.state = OTG_STATE_A_VBUS_ERR;
                omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
                ret = IRQ_HANDLED;
@@ -771,7 +773,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                /* role is peripheral */
                if (otg_ctrl & OTG_DRIVER_SEL) {
-                        switch (isp->otg.state) {
+                        switch (isp->phy.state) {
                        case OTG_STATE_A_IDLE:
                                b_idle(isp, __func__);
                                break;
@@ -787,19 +789,19 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                                omap_writel(otg_ctrl | OTG_A_BUSREQ, OTG_CTRL);
                        }
-                        if (isp->otg.host) {
+                        if (otg->host) {
-                                switch (isp->otg.state) {
+                                switch (isp->phy.state) {
                                case OTG_STATE_B_WAIT_ACON:
-                                        isp->otg.state = OTG_STATE_B_HOST;
+                                        isp->phy.state = OTG_STATE_B_HOST;
                                        pr_debug("  --> b_host\n");
                                        kick = 1;
                                        break;
                                case OTG_STATE_A_WAIT_BCON:
-                                        isp->otg.state = OTG_STATE_A_HOST;
+                                        isp->phy.state = OTG_STATE_A_HOST;
                                        pr_debug("  --> a_host\n");
                                        break;
                                case OTG_STATE_A_PERIPHERAL:
-                                        isp->otg.state = OTG_STATE_A_WAIT_BCON;
+                                        isp->phy.state = OTG_STATE_A_WAIT_BCON;
                                        pr_debug("  --> a_wait_bcon\n");
                                        break;
                                default:
@@ -813,8 +815,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                ret = IRQ_HANDLED;
                if (kick)
-                        usb_bus_start_enum(isp->otg.host,
+                        usb_bus_start_enum(otg->host, otg->host->otg_port);
-                                                isp->otg.host->otg_port);
        }
        check_state(isp, __func__);
@@ -930,7 +931,7 @@ static void b_peripheral(struct isp1301 *isp)
        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
        omap_writel(l, OTG_CTRL);
-        usb_gadget_vbus_connect(isp->otg.gadget);
+        usb_gadget_vbus_connect(isp->phy.otg->gadget);
 #ifdef  CONFIG_USB_OTG
        enable_vbus_draw(isp, 8);
@@ -940,7 +941,7 @@ static void b_peripheral(struct isp1301 *isp)
        /* UDC driver just set OTG_BSESSVLD */
        isp1301_set_bits(isp, ISP1301_OTG_CONTROL_1, OTG1_DP_PULLUP);
        isp1301_clear_bits(isp, ISP1301_OTG_CONTROL_1, OTG1_DP_PULLDOWN);
-        isp->otg.state = OTG_STATE_B_PERIPHERAL;
+        isp->phy.state = OTG_STATE_B_PERIPHERAL;
        pr_debug("  --> b_peripheral\n");
        dump_regs(isp, "2periph");
 #endif
@@ -948,8 +949,9 @@ static void b_peripheral(struct isp1301 *isp)
 static void isp_update_otg(struct isp1301 *isp, u8 stat)
 {
+        struct usb_otg          *otg = isp->phy.otg;
        u8                      isp_stat, isp_bstat;
-        enum usb_otg_state      state = isp->otg.state;
+        enum usb_otg_state      state = isp->phy.state;
        if (stat & INTR_BDIS_ACON)
                pr_debug("OTG:  BDIS_ACON, %s\n", state_name(isp));
@@ -957,7 +959,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
        /* start certain state transitions right away */
        isp_stat = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE);
        if (isp_stat & INTR_ID_GND) {
-                if (isp->otg.default_a) {
+                if (otg->default_a) {
                        switch (state) {
                        case OTG_STATE_B_IDLE:
                                a_idle(isp, "idle");
@@ -972,7 +974,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                                 * when HNP is used.
                                 */
                                if (isp_stat & INTR_VBUS_VLD)
-                                        isp->otg.state = OTG_STATE_A_HOST;
+                                        isp->phy.state = OTG_STATE_A_HOST;
                                break;
                        case OTG_STATE_A_WAIT_VFALL:
                                if (!(isp_stat & INTR_SESS_VLD))
@@ -980,7 +982,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                                break;
                        default:
                                if (!(isp_stat & INTR_VBUS_VLD))
-                                        isp->otg.state = OTG_STATE_A_VBUS_ERR;
+                                        isp->phy.state = OTG_STATE_A_VBUS_ERR;
                                break;
                        }
                        isp_bstat = isp1301_get_u8(isp, ISP1301_OTG_STATUS);
@@ -989,14 +991,14 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                        case OTG_STATE_B_PERIPHERAL:
                        case OTG_STATE_B_HOST:
                        case OTG_STATE_B_WAIT_ACON:
-                                usb_gadget_vbus_disconnect(isp->otg.gadget);
+                                usb_gadget_vbus_disconnect(otg->gadget);
                                break;
                        default:
                                break;
                        }
                        if (state != OTG_STATE_A_IDLE)
                                a_idle(isp, "id");
-                        if (isp->otg.host && state == OTG_STATE_A_IDLE)
+                        if (otg->host && state == OTG_STATE_A_IDLE)
                                isp1301_defer_work(isp, WORK_HOST_RESUME);
                        isp_bstat = 0;
                }
@@ -1006,10 +1008,10 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                /* if user unplugged mini-A end of cable,
                 * don't bypass A_WAIT_VFALL.
                 */
-                if (isp->otg.default_a) {
+                if (otg->default_a) {
                        switch (state) {
                        default:
-                                isp->otg.state = OTG_STATE_A_WAIT_VFALL;
+                                isp->phy.state = OTG_STATE_A_WAIT_VFALL;
                                break;
                        case OTG_STATE_A_WAIT_VFALL:
                                state = OTG_STATE_A_IDLE;
@@ -1022,7 +1024,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                                host_suspend(isp);
                                isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1,
                                                MC1_BDIS_ACON_EN);
-                                isp->otg.state = OTG_STATE_B_IDLE;
+                                isp->phy.state = OTG_STATE_B_IDLE;
                                l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
                                l &= ~OTG_CTRL_BITS;
                                omap_writel(l, OTG_CTRL);
@@ -1033,7 +1035,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                }
                isp_bstat = isp1301_get_u8(isp, ISP1301_OTG_STATUS);
-                switch (isp->otg.state) {
+                switch (isp->phy.state) {
                case OTG_STATE_B_PERIPHERAL:
                case OTG_STATE_B_WAIT_ACON:
                case OTG_STATE_B_HOST:
@@ -1055,7 +1057,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                        omap_writel(l, OTG_CTRL);
                        /* FALLTHROUGH */
                case OTG_STATE_B_IDLE:
-                        if (isp->otg.gadget && (isp_bstat & OTG_B_SESS_VLD)) {
+                        if (otg->gadget && (isp_bstat & OTG_B_SESS_VLD)) {
 #ifdef  CONFIG_USB_OTG
                                update_otg1(isp, isp_stat);
                                update_otg2(isp, isp_bstat);
@@ -1073,7 +1075,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                }
        }
-        if (state != isp->otg.state)
+        if (state != isp->phy.state)
                pr_debug("  isp, %s -> %s\n",
                                otg_state_string(state), state_name(isp));
@@ -1131,10 +1133,10 @@ isp1301_work(struct work_struct *work)
                         * skip A_WAIT_VRISE; hc transitions invisibly
                         * skip A_WAIT_BCON; same.
                         */
-                        switch (isp->otg.state) {
+                        switch (isp->phy.state) {
                        case OTG_STATE_A_WAIT_BCON:
                        case OTG_STATE_A_WAIT_VRISE:
-                                isp->otg.state = OTG_STATE_A_HOST;
+                                isp->phy.state = OTG_STATE_A_HOST;
                                pr_debug("  --> a_host\n");
                                otg_ctrl = omap_readl(OTG_CTRL);
                                otg_ctrl |= OTG_A_BUSREQ;
@@ -1143,7 +1145,7 @@ isp1301_work(struct work_struct *work)
                                omap_writel(otg_ctrl, OTG_CTRL);
                                break;
                        case OTG_STATE_B_WAIT_ACON:
-                                isp->otg.state = OTG_STATE_B_HOST;
+                                isp->phy.state = OTG_STATE_B_HOST;
                                pr_debug("  --> b_host (acon)\n");
                                break;
                        case OTG_STATE_B_HOST:
@@ -1204,6 +1206,7 @@ static void isp1301_release(struct device *dev)
        /* ugly -- i2c hijacks our memory hook to wait_for_completion() */
        if (isp->i2c_release)
                isp->i2c_release(dev);
+        kfree(isp->phy.otg);
        kfree (isp);
 }
@@ -1274,9 +1277,9 @@ static int isp1301_otg_enable(struct isp1301 *isp)
 /* add or disable the host device+driver */
 static int
-isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
+isp1301_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct isp1301  *isp = container_of(otg, struct isp1301, otg);
+        struct isp1301  *isp = container_of(otg->phy, struct isp1301, phy);
        if (!otg || isp != the_transceiver)
                return -ENODEV;
@@ -1284,21 +1287,21 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
        if (!host) {
                omap_writew(0, OTG_IRQ_EN);
                power_down(isp);
-                isp->otg.host = NULL;
+                otg->host = NULL;
                return 0;
        }
 #ifdef  CONFIG_USB_OTG
-        isp->otg.host = host;
+        otg->host = host;
        dev_dbg(&isp->client->dev, "registered host\n");
        host_suspend(isp);
-        if (isp->otg.gadget)
+        if (otg->gadget)
                return isp1301_otg_enable(isp);
        return 0;
 #elif   !defined(CONFIG_USB_GADGET_OMAP)
        // FIXME update its refcount
-        isp->otg.host = host;
+        otg->host = host;
        power_up(isp);
@@ -1330,9 +1333,9 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 }
 static int
-isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
+isp1301_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
 {
-        struct isp1301  *isp = container_of(otg, struct isp1301, otg);
+        struct isp1301  *isp = container_of(otg->phy, struct isp1301, phy);
 #ifndef CONFIG_USB_OTG
        u32 l;
 #endif
@@ -1342,24 +1345,24 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
        if (!gadget) {
                omap_writew(0, OTG_IRQ_EN);
-                if (!isp->otg.default_a)
+                if (!otg->default_a)
                        enable_vbus_draw(isp, 0);
-                usb_gadget_vbus_disconnect(isp->otg.gadget);
+                usb_gadget_vbus_disconnect(otg->gadget);
-                isp->otg.gadget = NULL;
+                otg->gadget = NULL;
                power_down(isp);
                return 0;
        }
 #ifdef  CONFIG_USB_OTG
-        isp->otg.gadget = gadget;
+        otg->gadget = gadget;
        dev_dbg(&isp->client->dev, "registered gadget\n");
        /* gadget driver may be suspended until vbus_connect () */
-        if (isp->otg.host)
+        if (otg->host)
                return isp1301_otg_enable(isp);
        return 0;
 #elif   !defined(CONFIG_USB_OHCI_HCD) && !defined(CONFIG_USB_OHCI_HCD_MODULE)
-        isp->otg.gadget = gadget;
+        otg->gadget = gadget;
        // FIXME update its refcount
        l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
@@ -1368,7 +1371,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
        omap_writel(l, OTG_CTRL);
        power_up(isp);
-        isp->otg.state = OTG_STATE_B_IDLE;
+        isp->phy.state = OTG_STATE_B_IDLE;
        if (machine_is_omap_h2() || machine_is_omap_h3())
                isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
@@ -1399,7 +1402,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 /*-------------------------------------------------------------------------*/
 static int
-isp1301_set_power(struct otg_transceiver *dev, unsigned mA)
+isp1301_set_power(struct usb_phy *dev, unsigned mA)
 {
        if (!the_transceiver)
                return -ENODEV;
@@ -1409,13 +1412,13 @@ isp1301_set_power(struct otg_transceiver *dev, unsigned mA)
 }
 static int
-isp1301_start_srp(struct otg_transceiver *dev)
+isp1301_start_srp(struct usb_otg *otg)
 {
-        struct isp1301  *isp = container_of(dev, struct isp1301, otg);
+        struct isp1301  *isp = container_of(otg->phy, struct isp1301, phy);
        u32             otg_ctrl;
-        if (!dev || isp != the_transceiver
+        if (!otg || isp != the_transceiver
-                        || isp->otg.state != OTG_STATE_B_IDLE)
+                        || isp->phy.state != OTG_STATE_B_IDLE)
                return -ENODEV;
        otg_ctrl = omap_readl(OTG_CTRL);
@@ -1425,7 +1428,7 @@ isp1301_start_srp(struct otg_transceiver *dev)
        otg_ctrl |= OTG_B_BUSREQ;
        otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK;
        omap_writel(otg_ctrl, OTG_CTRL);
-        isp->otg.state = OTG_STATE_B_SRP_INIT;
+        isp->phy.state = OTG_STATE_B_SRP_INIT;
        pr_debug("otg: SRP, %s ... %06x\n", state_name(isp),
                        omap_readl(OTG_CTRL));
@@ -1436,27 +1439,26 @@ isp1301_start_srp(struct otg_transceiver *dev)
 }
 static int
-isp1301_start_hnp(struct otg_transceiver *dev)
+isp1301_start_hnp(struct usb_otg *otg)
 {
 #ifdef  CONFIG_USB_OTG
-        struct isp1301  *isp = container_of(dev, struct isp1301, otg);
+        struct isp1301  *isp = container_of(otg->phy, struct isp1301, phy);
        u32 l;
-        if (!dev || isp != the_transceiver)
+        if (!otg || isp != the_transceiver)
                return -ENODEV;
-        if (isp->otg.default_a && (isp->otg.host == NULL
+        if (otg->default_a && (otg->host == NULL || !otg->host->b_hnp_enable))
-                        || !isp->otg.host->b_hnp_enable))
                return -ENOTCONN;
-        if (!isp->otg.default_a && (isp->otg.gadget == NULL
+        if (!otg->default_a && (otg->gadget == NULL
-                        || !isp->otg.gadget->b_hnp_enable))
+                        || !otg->gadget->b_hnp_enable))
                return -ENOTCONN;
        /* We want hardware to manage most HNP protocol timings.
         * So do this part as early as possible...
         */
-        switch (isp->otg.state) {
+        switch (isp->phy.state) {
        case OTG_STATE_B_HOST:
-                isp->otg.state = OTG_STATE_B_PERIPHERAL;
+                isp->phy.state = OTG_STATE_B_PERIPHERAL;
                /* caller will suspend next */
                break;
        case OTG_STATE_A_HOST:
@@ -1466,7 +1468,7 @@ isp1301_start_hnp(struct otg_transceiver *dev)
                                MC1_BDIS_ACON_EN);
 #endif
                /* caller must suspend then clear A_BUSREQ */
-                usb_gadget_vbus_connect(isp->otg.gadget);
+                usb_gadget_vbus_connect(otg->gadget);
                l = omap_readl(OTG_CTRL);
                l |= OTG_A_SETB_HNPEN;
                omap_writel(l, OTG_CTRL);
@@ -1503,6 +1505,12 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
        if (!isp)
                return 0;
+        isp->phy.otg = kzalloc(sizeof *isp->phy.otg, GFP_KERNEL);
+        if (!isp->phy.otg) {
+                kfree(isp);
+                return 0;
+        }
        INIT_WORK(&isp->work, isp1301_work);
        init_timer(&isp->timer);
        isp->timer.function = isp1301_timer;
@@ -1576,14 +1584,15 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
                goto fail;
        }
-        isp->otg.dev = &i2c->dev;
+        isp->phy.dev = &i2c->dev;
-        isp->otg.label = DRIVER_NAME;
+        isp->phy.label = DRIVER_NAME;
+        isp->phy.set_power = isp1301_set_power,
-        isp->otg.set_host = isp1301_set_host,
+        isp->phy.otg->phy = &isp->phy;
-        isp->otg.set_peripheral = isp1301_set_peripheral,
+        isp->phy.otg->set_host = isp1301_set_host,
-        isp->otg.set_power = isp1301_set_power,
+        isp->phy.otg->set_peripheral = isp1301_set_peripheral,
-        isp->otg.start_srp = isp1301_start_srp,
+        isp->phy.otg->start_srp = isp1301_start_srp,
-        isp->otg.start_hnp = isp1301_start_hnp,
+        isp->phy.otg->start_hnp = isp1301_start_hnp,
        enable_vbus_draw(isp, 0);
        power_down(isp);
@@ -1601,7 +1610,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
        dev_dbg(&i2c->dev, "scheduled timer, %d min\n", TIMER_MINUTES);
 #endif
-        status = otg_set_transceiver(&isp->otg);
+        status = usb_set_transceiver(&isp->phy);
        if (status < 0)
                dev_err(&i2c->dev, "can't register transceiver, %d\n",
                        status);
@@ -1609,6 +1618,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
        return 0;
 fail:
+        kfree(isp->phy.otg);
        kfree(isp);
        return -ENODEV;
 }
@@ -1639,7 +1649,7 @@ subsys_initcall(isp_init);
 static void __exit isp_exit(void)
 {
        if (the_transceiver)
-                otg_set_transceiver(NULL);
+                usb_set_transceiver(NULL);
        i2c_del_driver(&isp1301_driver);
 }
 module_exit(isp_exit);
diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index b276f8fcdeb..1d0347c247d 100644
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -69,9 +69,9 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
        int ret = 0;
        if (init) {
-                hsusb_vddcx = regulator_get(motg->otg.dev, "HSUSB_VDDCX");
+                hsusb_vddcx = regulator_get(motg->phy.dev, "HSUSB_VDDCX");
                if (IS_ERR(hsusb_vddcx)) {
-                        dev_err(motg->otg.dev, "unable to get hsusb vddcx\n");
+                        dev_err(motg->phy.dev, "unable to get hsusb vddcx\n");
                        return PTR_ERR(hsusb_vddcx);
                }
@@ -79,7 +79,7 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
                                USB_PHY_VDD_DIG_VOL_MIN,
                                USB_PHY_VDD_DIG_VOL_MAX);
                if (ret) {
-                        dev_err(motg->otg.dev, "unable to set the voltage "
+                        dev_err(motg->phy.dev, "unable to set the voltage "
                                        "for hsusb vddcx\n");
                        regulator_put(hsusb_vddcx);
                        return ret;
@@ -87,18 +87,18 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
                ret = regulator_enable(hsusb_vddcx);
                if (ret) {
-                        dev_err(motg->otg.dev, "unable to enable hsusb vddcx\n");
+                        dev_err(motg->phy.dev, "unable to enable hsusb vddcx\n");
                        regulator_put(hsusb_vddcx);
                }
        } else {
                ret = regulator_set_voltage(hsusb_vddcx, 0,
                        USB_PHY_VDD_DIG_VOL_MAX);
                if (ret)
-                        dev_err(motg->otg.dev, "unable to set the voltage "
+                        dev_err(motg->phy.dev, "unable to set the voltage "
                                        "for hsusb vddcx\n");
                ret = regulator_disable(hsusb_vddcx);
                if (ret)
-                        dev_err(motg->otg.dev, "unable to disable hsusb vddcx\n");
+                        dev_err(motg->phy.dev, "unable to disable hsusb vddcx\n");
                regulator_put(hsusb_vddcx);
        }
@@ -111,40 +111,40 @@ static int msm_hsusb_ldo_init(struct msm_otg *motg, int init)
        int rc = 0;
        if (init) {
-                hsusb_3p3 = regulator_get(motg->otg.dev, "HSUSB_3p3");
+                hsusb_3p3 = regulator_get(motg->phy.dev, "HSUSB_3p3");
                if (IS_ERR(hsusb_3p3)) {
-                        dev_err(motg->otg.dev, "unable to get hsusb 3p3\n");
+                        dev_err(motg->phy.dev, "unable to get hsusb 3p3\n");
                        return PTR_ERR(hsusb_3p3);
                }
                rc = regulator_set_voltage(hsusb_3p3, USB_PHY_3P3_VOL_MIN,
                                USB_PHY_3P3_VOL_MAX);
                if (rc) {
-                        dev_err(motg->otg.dev, "unable to set voltage level "
+                        dev_err(motg->phy.dev, "unable to set voltage level "
                                        "for hsusb 3p3\n");
                        goto put_3p3;
                }
                rc = regulator_enable(hsusb_3p3);
                if (rc) {
-                        dev_err(motg->otg.dev, "unable to enable the hsusb 3p3\n");
+                        dev_err(motg->phy.dev, "unable to enable the hsusb 3p3\n");
                        goto put_3p3;
                }
-                hsusb_1p8 = regulator_get(motg->otg.dev, "HSUSB_1p8");
+                hsusb_1p8 = regulator_get(motg->phy.dev, "HSUSB_1p8");
                if (IS_ERR(hsusb_1p8)) {
-                        dev_err(motg->otg.dev, "unable to get hsusb 1p8\n");
+                        dev_err(motg->phy.dev, "unable to get hsusb 1p8\n");
                        rc = PTR_ERR(hsusb_1p8);
                        goto disable_3p3;
                }
                rc = regulator_set_voltage(hsusb_1p8, USB_PHY_1P8_VOL_MIN,
                                USB_PHY_1P8_VOL_MAX);
                if (rc) {
-                        dev_err(motg->otg.dev, "unable to set voltage level "
+                        dev_err(motg->phy.dev, "unable to set voltage level "
                                        "for hsusb 1p8\n");
                        goto put_1p8;
                }
                rc = regulator_enable(hsusb_1p8);
                if (rc) {
-                        dev_err(motg->otg.dev, "unable to enable the hsusb 1p8\n");
+                        dev_err(motg->phy.dev, "unable to enable the hsusb 1p8\n");
                        goto put_1p8;
                }
@@ -235,9 +235,9 @@ static int msm_hsusb_ldo_set_mode(int on)
        return ret < 0 ? ret : 0;
 }
-static int ulpi_read(struct otg_transceiver *otg, u32 reg)
+static int ulpi_read(struct usb_phy *phy, u32 reg)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
        int cnt = 0;
        /* initiate read operation */
@@ -253,16 +253,16 @@ static int ulpi_read(struct otg_transceiver *otg, u32 reg)
        }
        if (cnt >= ULPI_IO_TIMEOUT_USEC) {
-                dev_err(otg->dev, "ulpi_read: timeout %08x\n",
+                dev_err(phy->dev, "ulpi_read: timeout %08x\n",
                        readl(USB_ULPI_VIEWPORT));
                return -ETIMEDOUT;
        }
        return ULPI_DATA_READ(readl(USB_ULPI_VIEWPORT));
 }
-static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static int ulpi_write(struct usb_phy *phy, u32 val, u32 reg)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
        int cnt = 0;
        /* initiate write operation */
@@ -279,13 +279,13 @@ static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
        }
        if (cnt >= ULPI_IO_TIMEOUT_USEC) {
-                dev_err(otg->dev, "ulpi_write: timeout\n");
+                dev_err(phy->dev, "ulpi_write: timeout\n");
                return -ETIMEDOUT;
        }
        return 0;
 }
-static struct otg_io_access_ops msm_otg_io_ops = {
+static struct usb_phy_io_ops msm_otg_io_ops = {
        .read = ulpi_read,
        .write = ulpi_write,
 };
@@ -299,9 +299,9 @@ static void ulpi_init(struct msm_otg *motg)
                return;
        while (seq[0] >= 0) {
-                dev_vdbg(motg->otg.dev, "ulpi: write 0x%02x to 0x%02x\n",
+                dev_vdbg(motg->phy.dev, "ulpi: write 0x%02x to 0x%02x\n",
                                seq[0], seq[1]);
-                ulpi_write(&motg->otg, seq[0], seq[1]);
+                ulpi_write(&motg->phy, seq[0], seq[1]);
                seq += 2;
        }
 }
@@ -313,11 +313,11 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
        if (assert) {
                ret = clk_reset(motg->clk, CLK_RESET_ASSERT);
                if (ret)
-                        dev_err(motg->otg.dev, "usb hs_clk assert failed\n");
+                        dev_err(motg->phy.dev, "usb hs_clk assert failed\n");
        } else {
                ret = clk_reset(motg->clk, CLK_RESET_DEASSERT);
                if (ret)
-                        dev_err(motg->otg.dev, "usb hs_clk deassert failed\n");
+                        dev_err(motg->phy.dev, "usb hs_clk deassert failed\n");
        }
        return ret;
 }
@@ -328,13 +328,13 @@ static int msm_otg_phy_clk_reset(struct msm_otg *motg)
        ret = clk_reset(motg->phy_reset_clk, CLK_RESET_ASSERT);
        if (ret) {
-                dev_err(motg->otg.dev, "usb phy clk assert failed\n");
+                dev_err(motg->phy.dev, "usb phy clk assert failed\n");
                return ret;
        }
        usleep_range(10000, 12000);
        ret = clk_reset(motg->phy_reset_clk, CLK_RESET_DEASSERT);
        if (ret)
-                dev_err(motg->otg.dev, "usb phy clk deassert failed\n");
+                dev_err(motg->phy.dev, "usb phy clk deassert failed\n");
        return ret;
 }
@@ -358,7 +358,7 @@ static int msm_otg_phy_reset(struct msm_otg *motg)
        writel(val | PORTSC_PTS_ULPI, USB_PORTSC);
        for (retries = 3; retries > 0; retries--) {
-                ret = ulpi_write(&motg->otg, ULPI_FUNC_CTRL_SUSPENDM,
+                ret = ulpi_write(&motg->phy, ULPI_FUNC_CTRL_SUSPENDM,
                                ULPI_CLR(ULPI_FUNC_CTRL));
                if (!ret)
                        break;
@@ -375,7 +375,7 @@ static int msm_otg_phy_reset(struct msm_otg *motg)
                return ret;
        for (retries = 3; retries > 0; retries--) {
-                ret = ulpi_read(&motg->otg, ULPI_DEBUG);
+                ret = ulpi_read(&motg->phy, ULPI_DEBUG);
                if (ret != -ETIMEDOUT)
                        break;
                ret = msm_otg_phy_clk_reset(motg);
@@ -385,14 +385,14 @@ static int msm_otg_phy_reset(struct msm_otg *motg)
        if (!retries)
                return -ETIMEDOUT;
-        dev_info(motg->otg.dev, "phy_reset: success\n");
+        dev_info(motg->phy.dev, "phy_reset: success\n");
        return 0;
 }
 #define LINK_RESET_TIMEOUT_USEC         (250 * 1000)
-static int msm_otg_reset(struct otg_transceiver *otg)
+static int msm_otg_reset(struct usb_phy *phy)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
        struct msm_otg_platform_data *pdata = motg->pdata;
        int cnt = 0;
        int ret;
@@ -401,7 +401,7 @@ static int msm_otg_reset(struct otg_transceiver *otg)
        ret = msm_otg_phy_reset(motg);
        if (ret) {
-                dev_err(otg->dev, "phy_reset failed\n");
+                dev_err(phy->dev, "phy_reset failed\n");
                return ret;
        }
@@ -435,8 +435,8 @@ static int msm_otg_reset(struct otg_transceiver *otg)
                        val |= OTGSC_BSVIE;
                }
                writel(val, USB_OTGSC);
-                ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_RISE);
+                ulpi_write(phy, ulpi_val, ULPI_USB_INT_EN_RISE);
-                ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_FALL);
+                ulpi_write(phy, ulpi_val, ULPI_USB_INT_EN_FALL);
        }
        return 0;
@@ -448,8 +448,8 @@ static int msm_otg_reset(struct otg_transceiver *otg)
 #ifdef CONFIG_PM_SLEEP
 static int msm_otg_suspend(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
-        struct usb_bus *bus = otg->host;
+        struct usb_bus *bus = phy->otg->host;
        struct msm_otg_platform_data *pdata = motg->pdata;
        int cnt = 0;
@@ -475,10 +475,10 @@ static int msm_otg_suspend(struct msm_otg *motg)
         */
        if (motg->pdata->phy_type == CI_45NM_INTEGRATED_PHY) {
-                ulpi_read(otg, 0x14);
+                ulpi_read(phy, 0x14);
                if (pdata->otg_control == OTG_PHY_CONTROL)
-                        ulpi_write(otg, 0x01, 0x30);
+                        ulpi_write(phy, 0x01, 0x30);
-                ulpi_write(otg, 0x08, 0x09);
+                ulpi_write(phy, 0x08, 0x09);
        }
        /*
@@ -495,8 +495,8 @@ static int msm_otg_suspend(struct msm_otg *motg)
        }
        if (cnt >= PHY_SUSPEND_TIMEOUT_USEC) {
-                dev_err(otg->dev, "Unable to suspend PHY\n");
+                dev_err(phy->dev, "Unable to suspend PHY\n");
-                msm_otg_reset(otg);
+                msm_otg_reset(phy);
                enable_irq(motg->irq);
                return -ETIMEDOUT;
        }
@@ -528,7 +528,7 @@ static int msm_otg_suspend(struct msm_otg *motg)
                msm_hsusb_config_vddcx(0);
        }
-        if (device_may_wakeup(otg->dev))
+        if (device_may_wakeup(phy->dev))
                enable_irq_wake(motg->irq);
        if (bus)
                clear_bit(HCD_FLAG_HW_ACCESSIBLE, &(bus_to_hcd(bus))->flags);
@@ -536,15 +536,15 @@ static int msm_otg_suspend(struct msm_otg *motg)
        atomic_set(&motg->in_lpm, 1);
        enable_irq(motg->irq);
-        dev_info(otg->dev, "USB in low power mode\n");
+        dev_info(phy->dev, "USB in low power mode\n");
        return 0;
 }
 static int msm_otg_resume(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
-        struct usb_bus *bus = otg->host;
+        struct usb_bus *bus = phy->otg->host;
        int cnt = 0;
        unsigned temp;
@@ -592,13 +592,13 @@ static int msm_otg_resume(struct msm_otg *motg)
                 * PHY. USB state can not be restored. Re-insertion
                 * of USB cable is the only way to get USB working.
                 */
-                dev_err(otg->dev, "Unable to resume USB."
+                dev_err(phy->dev, "Unable to resume USB."
                                "Re-plugin the cable\n");
-                msm_otg_reset(otg);
+                msm_otg_reset(phy);
        }
 skip_phy_resume:
-        if (device_may_wakeup(otg->dev))
+        if (device_may_wakeup(phy->dev))
                disable_irq_wake(motg->irq);
        if (bus)
                set_bit(HCD_FLAG_HW_ACCESSIBLE, &(bus_to_hcd(bus))->flags);
@@ -607,11 +607,11 @@ skip_phy_resume:
        if (motg->async_int) {
                motg->async_int = 0;
-                pm_runtime_put(otg->dev);
+                pm_runtime_put(phy->dev);
                enable_irq(motg->irq);
        }
-        dev_info(otg->dev, "USB exited from low power mode\n");
+        dev_info(phy->dev, "USB exited from low power mode\n");
        return 0;
 }
@@ -623,13 +623,13 @@ static void msm_otg_notify_charger(struct msm_otg *motg, unsigned mA)
                return;
        /* TODO: Notify PMIC about available current */
-        dev_info(motg->otg.dev, "Avail curr from USB = %u\n", mA);
+        dev_info(motg->phy.dev, "Avail curr from USB = %u\n", mA);
        motg->cur_power = mA;
 }
-static int msm_otg_set_power(struct otg_transceiver *otg, unsigned mA)
+static int msm_otg_set_power(struct usb_phy *phy, unsigned mA)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
        /*
         * Gadget driver uses set_power method to notify about the
@@ -644,19 +644,19 @@ static int msm_otg_set_power(struct otg_transceiver *otg, unsigned mA)
        return 0;
 }
-static void msm_otg_start_host(struct otg_transceiver *otg, int on)
+static void msm_otg_start_host(struct usb_phy *phy, int on)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
        struct msm_otg_platform_data *pdata = motg->pdata;
        struct usb_hcd *hcd;
-        if (!otg->host)
+        if (!phy->otg->host)
                return;
-        hcd = bus_to_hcd(otg->host);
+        hcd = bus_to_hcd(phy->otg->host);
        if (on) {
-                dev_dbg(otg->dev, "host on\n");
+                dev_dbg(phy->dev, "host on\n");
                if (pdata->vbus_power)
                        pdata->vbus_power(1);
@@ -671,7 +671,7 @@ static void msm_otg_start_host(struct otg_transceiver *otg, int on)
                usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
 #endif
        } else {
-                dev_dbg(otg->dev, "host off\n");
+                dev_dbg(phy->dev, "host off\n");
 #ifdef CONFIG_USB
                usb_remove_hcd(hcd);
@@ -683,9 +683,9 @@ static void msm_otg_start_host(struct otg_transceiver *otg, int on)
        }
 }
-static int msm_otg_set_host(struct otg_transceiver *otg, struct usb_bus *host)
+static int msm_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(otg->phy, struct msm_otg, phy);
        struct usb_hcd *hcd;
        /*
@@ -693,16 +693,16 @@ static int msm_otg_set_host(struct otg_transceiver *otg, struct usb_bus *host)
         * only peripheral configuration.
         */
        if (motg->pdata->mode == USB_PERIPHERAL) {
-                dev_info(otg->dev, "Host mode is not supported\n");
+                dev_info(otg->phy->dev, "Host mode is not supported\n");
                return -ENODEV;
        }
        if (!host) {
-                if (otg->state == OTG_STATE_A_HOST) {
+                if (otg->phy->state == OTG_STATE_A_HOST) {
-                        pm_runtime_get_sync(otg->dev);
+                        pm_runtime_get_sync(otg->phy->dev);
-                        msm_otg_start_host(otg, 0);
+                        msm_otg_start_host(otg->phy, 0);
                        otg->host = NULL;
-                        otg->state = OTG_STATE_UNDEFINED;
+                        otg->phy->state = OTG_STATE_UNDEFINED;
                        schedule_work(&motg->sm_work);
                } else {
                        otg->host = NULL;
@@ -715,30 +715,30 @@ static int msm_otg_set_host(struct otg_transceiver *otg, struct usb_bus *host)
        hcd->power_budget = motg->pdata->power_budget;
        otg->host = host;
-        dev_dbg(otg->dev, "host driver registered w/ tranceiver\n");
+        dev_dbg(otg->phy->dev, "host driver registered w/ tranceiver\n");
        /*
         * Kick the state machine work, if peripheral is not supported
         * or peripheral is already registered with us.
         */
        if (motg->pdata->mode == USB_HOST || otg->gadget) {
-                pm_runtime_get_sync(otg->dev);
+                pm_runtime_get_sync(otg->phy->dev);
                schedule_work(&motg->sm_work);
        }
        return 0;
 }
-static void msm_otg_start_peripheral(struct otg_transceiver *otg, int on)
+static void msm_otg_start_peripheral(struct usb_phy *phy, int on)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
        struct msm_otg_platform_data *pdata = motg->pdata;
-        if (!otg->gadget)
+        if (!phy->otg->gadget)
                return;
        if (on) {
-                dev_dbg(otg->dev, "gadget on\n");
+                dev_dbg(phy->dev, "gadget on\n");
                /*
                 * Some boards have a switch cotrolled by gpio
                 * to enable/disable internal HUB. Disable internal
@@ -746,36 +746,36 @@ static void msm_otg_start_peripheral(struct otg_transceiver *otg, int on)
                 */
                if (pdata->setup_gpio)
                        pdata->setup_gpio(OTG_STATE_B_PERIPHERAL);
-                usb_gadget_vbus_connect(otg->gadget);
+                usb_gadget_vbus_connect(phy->otg->gadget);
        } else {
-                dev_dbg(otg->dev, "gadget off\n");
+                dev_dbg(phy->dev, "gadget off\n");
-                usb_gadget_vbus_disconnect(otg->gadget);
+                usb_gadget_vbus_disconnect(phy->otg->gadget);
                if (pdata->setup_gpio)
                        pdata->setup_gpio(OTG_STATE_UNDEFINED);
        }
 }
-static int msm_otg_set_peripheral(struct otg_transceiver *otg,
+static int msm_otg_set_peripheral(struct usb_otg *otg,
-                        struct usb_gadget *gadget)
+                                        struct usb_gadget *gadget)
 {
-        struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
+        struct msm_otg *motg = container_of(otg->phy, struct msm_otg, phy);
        /*
         * Fail peripheral registration if this board can support
         * only host configuration.
         */
        if (motg->pdata->mode == USB_HOST) {
-                dev_info(otg->dev, "Peripheral mode is not supported\n");
+                dev_info(otg->phy->dev, "Peripheral mode is not supported\n");
                return -ENODEV;
        }
        if (!gadget) {
-                if (otg->state == OTG_STATE_B_PERIPHERAL) {
+                if (otg->phy->state == OTG_STATE_B_PERIPHERAL) {
-                        pm_runtime_get_sync(otg->dev);
+                        pm_runtime_get_sync(otg->phy->dev);
-                        msm_otg_start_peripheral(otg, 0);
+                        msm_otg_start_peripheral(otg->phy, 0);
                        otg->gadget = NULL;
-                        otg->state = OTG_STATE_UNDEFINED;
+                        otg->phy->state = OTG_STATE_UNDEFINED;
                        schedule_work(&motg->sm_work);
                } else {
                        otg->gadget = NULL;
@@ -784,14 +784,14 @@ static int msm_otg_set_peripheral(struct otg_transceiver *otg,
                return 0;
        }
        otg->gadget = gadget;
-        dev_dbg(otg->dev, "peripheral driver registered w/ tranceiver\n");
+        dev_dbg(otg->phy->dev, "peripheral driver registered w/ tranceiver\n");
        /*
         * Kick the state machine work, if host is not supported
         * or host is already registered with us.
         */
        if (motg->pdata->mode == USB_PERIPHERAL || otg->host) {
-                pm_runtime_get_sync(otg->dev);
+                pm_runtime_get_sync(otg->phy->dev);
                schedule_work(&motg->sm_work);
        }
@@ -800,17 +800,17 @@ static int msm_otg_set_peripheral(struct otg_transceiver *otg,
 static bool msm_chg_check_secondary_det(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 chg_det;
        bool ret = false;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                ret = chg_det & (1 << 4);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x87);
+                chg_det = ulpi_read(phy, 0x87);
                ret = chg_det & 1;
                break;
        default:
@@ -821,38 +821,38 @@ static bool msm_chg_check_secondary_det(struct msm_otg *motg)
 static void msm_chg_enable_secondary_det(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 chg_det;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                /* Turn off charger block */
                chg_det |= ~(1 << 1);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                udelay(20);
                /* control chg block via ULPI */
                chg_det &= ~(1 << 3);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                /* put it in host mode for enabling D- source */
                chg_det &= ~(1 << 2);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                /* Turn on chg detect block */
                chg_det &= ~(1 << 1);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                udelay(20);
                /* enable chg detection */
                chg_det &= ~(1 << 0);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
                /*
                 * Configure DM as current source, DP as current sink
                 * and enable battery charging comparators.
                 */
-                ulpi_write(otg, 0x8, 0x85);
+                ulpi_write(phy, 0x8, 0x85);
-                ulpi_write(otg, 0x2, 0x85);
+                ulpi_write(phy, 0x2, 0x85);
-                ulpi_write(otg, 0x1, 0x85);
+                ulpi_write(phy, 0x1, 0x85);
                break;
        default:
                break;
@@ -861,17 +861,17 @@ static void msm_chg_enable_secondary_det(struct msm_otg *motg)
 static bool msm_chg_check_primary_det(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 chg_det;
        bool ret = false;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                ret = chg_det & (1 << 4);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x87);
+                chg_det = ulpi_read(phy, 0x87);
                ret = chg_det & 1;
                break;
        default:
@@ -882,23 +882,23 @@ static bool msm_chg_check_primary_det(struct msm_otg *motg)
 static void msm_chg_enable_primary_det(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 chg_det;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                /* enable chg detection */
                chg_det &= ~(1 << 0);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
                /*
                 * Configure DP as current source, DM as current sink
                 * and enable battery charging comparators.
                 */
-                ulpi_write(otg, 0x2, 0x85);
+                ulpi_write(phy, 0x2, 0x85);
-                ulpi_write(otg, 0x1, 0x85);
+                ulpi_write(phy, 0x1, 0x85);
                break;
        default:
                break;
@@ -907,17 +907,17 @@ static void msm_chg_enable_primary_det(struct msm_otg *motg)
 static bool msm_chg_check_dcd(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 line_state;
        bool ret = false;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                line_state = ulpi_read(otg, 0x15);
+                line_state = ulpi_read(phy, 0x15);
                ret = !(line_state & 1);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
-                line_state = ulpi_read(otg, 0x87);
+                line_state = ulpi_read(phy, 0x87);
                ret = line_state & 2;
                break;
        default:
@@ -928,17 +928,17 @@ static bool msm_chg_check_dcd(struct msm_otg *motg)
 static void msm_chg_disable_dcd(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 chg_det;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                chg_det &= ~(1 << 5);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
-                ulpi_write(otg, 0x10, 0x86);
+                ulpi_write(phy, 0x10, 0x86);
                break;
        default:
                break;
@@ -947,19 +947,19 @@ static void msm_chg_disable_dcd(struct msm_otg *motg)
 static void msm_chg_enable_dcd(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 chg_det;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                /* Turn on D+ current source */
                chg_det |= (1 << 5);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
                /* Data contact detection enable */
-                ulpi_write(otg, 0x10, 0x85);
+                ulpi_write(phy, 0x10, 0x85);
                break;
        default:
                break;
@@ -968,32 +968,32 @@ static void msm_chg_enable_dcd(struct msm_otg *motg)
 static void msm_chg_block_on(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 func_ctrl, chg_det;
        /* put the controller in non-driving mode */
-        func_ctrl = ulpi_read(otg, ULPI_FUNC_CTRL);
+        func_ctrl = ulpi_read(phy, ULPI_FUNC_CTRL);
        func_ctrl &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
        func_ctrl |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-        ulpi_write(otg, func_ctrl, ULPI_FUNC_CTRL);
+        ulpi_write(phy, func_ctrl, ULPI_FUNC_CTRL);
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                /* control chg block via ULPI */
                chg_det &= ~(1 << 3);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                /* Turn on chg detect block */
                chg_det &= ~(1 << 1);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                udelay(20);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
                /* Clear charger detecting control bits */
-                ulpi_write(otg, 0x3F, 0x86);
+                ulpi_write(phy, 0x3F, 0x86);
                /* Clear alt interrupt latch and enable bits */
-                ulpi_write(otg, 0x1F, 0x92);
+                ulpi_write(phy, 0x1F, 0x92);
-                ulpi_write(otg, 0x1F, 0x95);
+                ulpi_write(phy, 0x1F, 0x95);
                udelay(100);
                break;
        default:
@@ -1003,32 +1003,32 @@ static void msm_chg_block_on(struct msm_otg *motg)
 static void msm_chg_block_off(struct msm_otg *motg)
 {
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 func_ctrl, chg_det;
        switch (motg->pdata->phy_type) {
        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(otg, 0x34);
+                chg_det = ulpi_read(phy, 0x34);
                /* Turn off charger block */
                chg_det |= ~(1 << 1);
-                ulpi_write(otg, chg_det, 0x34);
+                ulpi_write(phy, chg_det, 0x34);
                break;
        case SNPS_28NM_INTEGRATED_PHY:
                /* Clear charger detecting control bits */
-                ulpi_write(otg, 0x3F, 0x86);
+                ulpi_write(phy, 0x3F, 0x86);
                /* Clear alt interrupt latch and enable bits */
-                ulpi_write(otg, 0x1F, 0x92);
+                ulpi_write(phy, 0x1F, 0x92);
-                ulpi_write(otg, 0x1F, 0x95);
+                ulpi_write(phy, 0x1F, 0x95);
                break;
        default:
                break;
        }
        /* put the controller in normal mode */
-        func_ctrl = ulpi_read(otg, ULPI_FUNC_CTRL);
+        func_ctrl = ulpi_read(phy, ULPI_FUNC_CTRL);
        func_ctrl &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
        func_ctrl |= ULPI_FUNC_CTRL_OPMODE_NORMAL;
-        ulpi_write(otg, func_ctrl, ULPI_FUNC_CTRL);
+        ulpi_write(phy, func_ctrl, ULPI_FUNC_CTRL);
 }
 #define MSM_CHG_DCD_POLL_TIME           (100 * HZ/1000) /* 100 msec */
@@ -1038,14 +1038,14 @@ static void msm_chg_block_off(struct msm_otg *motg)
 static void msm_chg_detect_work(struct work_struct *w)
 {
        struct msm_otg *motg = container_of(w, struct msm_otg, chg_work.work);
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        bool is_dcd, tmout, vout;
        unsigned long delay;
-        dev_dbg(otg->dev, "chg detection work\n");
+        dev_dbg(phy->dev, "chg detection work\n");
        switch (motg->chg_state) {
        case USB_CHG_STATE_UNDEFINED:
-                pm_runtime_get_sync(otg->dev);
+                pm_runtime_get_sync(phy->dev);
                msm_chg_block_on(motg);
                msm_chg_enable_dcd(motg);
                motg->chg_state = USB_CHG_STATE_WAIT_FOR_DCD;
@@ -1088,7 +1088,7 @@ static void msm_chg_detect_work(struct work_struct *w)
                motg->chg_state = USB_CHG_STATE_DETECTED;
        case USB_CHG_STATE_DETECTED:
                msm_chg_block_off(motg);
-                dev_dbg(otg->dev, "charger = %d\n", motg->chg_type);
+                dev_dbg(phy->dev, "charger = %d\n", motg->chg_type);
                schedule_work(&motg->sm_work);
                return;
        default:
@@ -1152,22 +1152,22 @@ static void msm_otg_init_sm(struct msm_otg *motg)
 static void msm_otg_sm_work(struct work_struct *w)
 {
        struct msm_otg *motg = container_of(w, struct msm_otg, sm_work);
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_otg *otg = motg->phy.otg;
-        switch (otg->state) {
+        switch (otg->phy->state) {
        case OTG_STATE_UNDEFINED:
-                dev_dbg(otg->dev, "OTG_STATE_UNDEFINED state\n");
+                dev_dbg(otg->phy->dev, "OTG_STATE_UNDEFINED state\n");
-                msm_otg_reset(otg);
+                msm_otg_reset(otg->phy);
                msm_otg_init_sm(motg);
-                otg->state = OTG_STATE_B_IDLE;
+                otg->phy->state = OTG_STATE_B_IDLE;
                /* FALL THROUGH */
        case OTG_STATE_B_IDLE:
-                dev_dbg(otg->dev, "OTG_STATE_B_IDLE state\n");
+                dev_dbg(otg->phy->dev, "OTG_STATE_B_IDLE state\n");
                if (!test_bit(ID, &motg->inputs) && otg->host) {
                        /* disable BSV bit */
                        writel(readl(USB_OTGSC) & ~OTGSC_BSVIE, USB_OTGSC);
-                        msm_otg_start_host(otg, 1);
+                        msm_otg_start_host(otg->phy, 1);
-                        otg->state = OTG_STATE_A_HOST;
+                        otg->phy->state = OTG_STATE_A_HOST;
                } else if (test_bit(B_SESS_VLD, &motg->inputs)) {
                        switch (motg->chg_state) {
                        case USB_CHG_STATE_UNDEFINED:
@@ -1182,13 +1182,15 @@ static void msm_otg_sm_work(struct work_struct *w)
                                case USB_CDP_CHARGER:
                                        msm_otg_notify_charger(motg,
                                                        IDEV_CHG_MAX);
-                                        msm_otg_start_peripheral(otg, 1);
+                                        msm_otg_start_peripheral(otg->phy, 1);
-                                        otg->state = OTG_STATE_B_PERIPHERAL;
+                                        otg->phy->state
+                                                = OTG_STATE_B_PERIPHERAL;
                                        break;
                                case USB_SDP_CHARGER:
                                        msm_otg_notify_charger(motg, IUNIT);
-                                        msm_otg_start_peripheral(otg, 1);
+                                        msm_otg_start_peripheral(otg->phy, 1);
-                                        otg->state = OTG_STATE_B_PERIPHERAL;
+                                        otg->phy->state
+                                                = OTG_STATE_B_PERIPHERAL;
                                        break;
                                default:
                                        break;
@@ -1204,34 +1206,34 @@ static void msm_otg_sm_work(struct work_struct *w)
                         * is incremented in charger detection work.
                         */
                        if (cancel_delayed_work_sync(&motg->chg_work)) {
-                                pm_runtime_put_sync(otg->dev);
+                                pm_runtime_put_sync(otg->phy->dev);
-                                msm_otg_reset(otg);
+                                msm_otg_reset(otg->phy);
                        }
                        msm_otg_notify_charger(motg, 0);
                        motg->chg_state = USB_CHG_STATE_UNDEFINED;
                        motg->chg_type = USB_INVALID_CHARGER;
                }
-                pm_runtime_put_sync(otg->dev);
+                pm_runtime_put_sync(otg->phy->dev);
                break;
        case OTG_STATE_B_PERIPHERAL:
-                dev_dbg(otg->dev, "OTG_STATE_B_PERIPHERAL state\n");
+                dev_dbg(otg->phy->dev, "OTG_STATE_B_PERIPHERAL state\n");
                if (!test_bit(B_SESS_VLD, &motg->inputs) ||
                                !test_bit(ID, &motg->inputs)) {
                        msm_otg_notify_charger(motg, 0);
-                        msm_otg_start_peripheral(otg, 0);
+                        msm_otg_start_peripheral(otg->phy, 0);
                        motg->chg_state = USB_CHG_STATE_UNDEFINED;
                        motg->chg_type = USB_INVALID_CHARGER;
-                        otg->state = OTG_STATE_B_IDLE;
+                        otg->phy->state = OTG_STATE_B_IDLE;
-                        msm_otg_reset(otg);
+                        msm_otg_reset(otg->phy);
                        schedule_work(w);
                }
                break;
        case OTG_STATE_A_HOST:
-                dev_dbg(otg->dev, "OTG_STATE_A_HOST state\n");
+                dev_dbg(otg->phy->dev, "OTG_STATE_A_HOST state\n");
                if (test_bit(ID, &motg->inputs)) {
-                        msm_otg_start_host(otg, 0);
+                        msm_otg_start_host(otg->phy, 0);
-                        otg->state = OTG_STATE_B_IDLE;
+                        otg->phy->state = OTG_STATE_B_IDLE;
-                        msm_otg_reset(otg);
+                        msm_otg_reset(otg->phy);
                        schedule_work(w);
                }
                break;
@@ -1243,13 +1245,13 @@ static void msm_otg_sm_work(struct work_struct *w)
 static irqreturn_t msm_otg_irq(int irq, void *data)
 {
        struct msm_otg *motg = data;
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        u32 otgsc = 0;
        if (atomic_read(&motg->in_lpm)) {
                disable_irq_nosync(irq);
                motg->async_int = 1;
-                pm_runtime_get(otg->dev);
+                pm_runtime_get(phy->dev);
                return IRQ_HANDLED;
        }
@@ -1262,15 +1264,15 @@ static irqreturn_t msm_otg_irq(int irq, void *data)
                        set_bit(ID, &motg->inputs);
                else
                        clear_bit(ID, &motg->inputs);
-                dev_dbg(otg->dev, "ID set/clear\n");
+                dev_dbg(phy->dev, "ID set/clear\n");
-                pm_runtime_get_noresume(otg->dev);
+                pm_runtime_get_noresume(phy->dev);
        } else if ((otgsc & OTGSC_BSVIS) && (otgsc & OTGSC_BSVIE)) {
                if (otgsc & OTGSC_BSV)
                        set_bit(B_SESS_VLD, &motg->inputs);
                else
                        clear_bit(B_SESS_VLD, &motg->inputs);
-                dev_dbg(otg->dev, "BSV set/clear\n");
+                dev_dbg(phy->dev, "BSV set/clear\n");
-                pm_runtime_get_noresume(otg->dev);
+                pm_runtime_get_noresume(phy->dev);
        }
        writel(otgsc, USB_OTGSC);
@@ -1281,9 +1283,9 @@ static irqreturn_t msm_otg_irq(int irq, void *data)
 static int msm_otg_mode_show(struct seq_file *s, void *unused)
 {
        struct msm_otg *motg = s->private;
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_otg *otg = motg->phy.otg;
-        switch (otg->state) {
+        switch (otg->phy->state) {
        case OTG_STATE_A_HOST:
                seq_printf(s, "host\n");
                break;
@@ -1309,7 +1311,7 @@ static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
        struct seq_file *s = file->private_data;
        struct msm_otg *motg = s->private;
        char buf[16];
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_otg *otg = motg->phy.otg;
        int status = count;
        enum usb_mode_type req_mode;
@@ -1333,7 +1335,7 @@ static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
        switch (req_mode) {
        case USB_NONE:
-                switch (otg->state) {
+                switch (otg->phy->state) {
                case OTG_STATE_A_HOST:
                case OTG_STATE_B_PERIPHERAL:
                        set_bit(ID, &motg->inputs);
@@ -1344,7 +1346,7 @@ static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
                }
                break;
        case USB_PERIPHERAL:
-                switch (otg->state) {
+                switch (otg->phy->state) {
                case OTG_STATE_B_IDLE:
                case OTG_STATE_A_HOST:
                        set_bit(ID, &motg->inputs);
@@ -1355,7 +1357,7 @@ static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
                }
                break;
        case USB_HOST:
-                switch (otg->state) {
+                switch (otg->phy->state) {
                case OTG_STATE_B_IDLE:
                case OTG_STATE_B_PERIPHERAL:
                        clear_bit(ID, &motg->inputs);
@@ -1368,7 +1370,7 @@ static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
                goto out;
        }
-        pm_runtime_get_sync(otg->dev);
+        pm_runtime_get_sync(otg->phy->dev);
        schedule_work(&motg->sm_work);
 out:
        return status;
@@ -1414,7 +1416,7 @@ static int __init msm_otg_probe(struct platform_device *pdev)
        int ret = 0;
        struct resource *res;
        struct msm_otg *motg;
-        struct otg_transceiver *otg;
+        struct usb_phy *phy;
        dev_info(&pdev->dev, "msm_otg probe\n");
        if (!pdev->dev.platform_data) {
@@ -1428,9 +1430,15 @@ static int __init msm_otg_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
+        motg->phy.otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
+        if (!motg->phy.otg) {
+                dev_err(&pdev->dev, "unable to allocate msm_otg\n");
+                return -ENOMEM;
+        }
        motg->pdata = pdev->dev.platform_data;
-        otg = &motg->otg;
+        phy = &motg->phy;
-        otg->dev = &pdev->dev;
+        phy->dev = &pdev->dev;
        motg->phy_reset_clk = clk_get(&pdev->dev, "usb_phy_clk");
        if (IS_ERR(motg->phy_reset_clk)) {
@@ -1538,16 +1546,18 @@ static int __init msm_otg_probe(struct platform_device *pdev)
                goto disable_clks;
        }
-        otg->init = msm_otg_reset;
+        phy->init = msm_otg_reset;
-        otg->set_host = msm_otg_set_host;
+        phy->set_power = msm_otg_set_power;
-        otg->set_peripheral = msm_otg_set_peripheral;
-        otg->set_power = msm_otg_set_power;
+        phy->io_ops = &msm_otg_io_ops;
-        otg->io_ops = &msm_otg_io_ops;
+        phy->otg->phy = &motg->phy;
+        phy->otg->set_host = msm_otg_set_host;
+        phy->otg->set_peripheral = msm_otg_set_peripheral;
-        ret = otg_set_transceiver(&motg->otg);
+        ret = usb_set_transceiver(&motg->phy);
        if (ret) {
-                dev_err(&pdev->dev, "otg_set_transceiver failed\n");
+                dev_err(&pdev->dev, "usb_set_transceiver failed\n");
                goto free_irq;
        }
@@ -1591,6 +1601,7 @@ put_clk:
 put_phy_reset_clk:
        clk_put(motg->phy_reset_clk);
 free_motg:
+        kfree(motg->phy.otg);
        kfree(motg);
        return ret;
 }
@@ -1598,10 +1609,10 @@ free_motg:
 static int __devexit msm_otg_remove(struct platform_device *pdev)
 {
        struct msm_otg *motg = platform_get_drvdata(pdev);
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_phy *phy = &motg->phy;
        int cnt = 0;
-        if (otg->host || otg->gadget)
+        if (phy->otg->host || phy->otg->gadget)
                return -EBUSY;
        msm_otg_debugfs_cleanup();
@@ -1613,14 +1624,14 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 0);
        pm_runtime_disable(&pdev->dev);
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
        free_irq(motg->irq, motg);
        /*
         * Put PHY in low power mode.
         */
-        ulpi_read(otg, 0x14);
+        ulpi_read(phy, 0x14);
-        ulpi_write(otg, 0x08, 0x09);
+        ulpi_write(phy, 0x08, 0x09);
        writel(readl(USB_PORTSC) | PORTSC_PHCD, USB_PORTSC);
        while (cnt < PHY_SUSPEND_TIMEOUT_USEC) {
@@ -1630,7 +1641,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
                cnt++;
        }
        if (cnt >= PHY_SUSPEND_TIMEOUT_USEC)
-                dev_err(otg->dev, "Unable to suspend PHY\n");
+                dev_err(phy->dev, "Unable to suspend PHY\n");
        clk_disable(motg->pclk);
        clk_disable(motg->clk);
@@ -1651,6 +1662,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
        if (motg->core_clk)
                clk_put(motg->core_clk);
+        kfree(motg->phy.otg);
        kfree(motg);
        return 0;
@@ -1660,7 +1672,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
 static int msm_otg_runtime_idle(struct device *dev)
 {
        struct msm_otg *motg = dev_get_drvdata(dev);
-        struct otg_transceiver *otg = &motg->otg;
+        struct usb_otg *otg = motg->phy.otg;
        dev_dbg(dev, "OTG runtime idle\n");
@@ -1670,7 +1682,7 @@ static int msm_otg_runtime_idle(struct device *dev)
         * This 1 sec delay also prevents entering into LPM immediately
         * after asynchronous interrupt.
         */
-        if (otg->state != OTG_STATE_UNDEFINED)
+        if (otg->phy->state != OTG_STATE_UNDEFINED)
                pm_schedule_suspend(dev, 1000);
        return -EAGAIN;
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index b5fbe1452ab..6cc6c3ffbb8 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -55,16 +55,16 @@ static char *state_string[] = {
        "a_vbus_err"
 };
-static int mv_otg_set_vbus(struct otg_transceiver *otg, bool on)
+static int mv_otg_set_vbus(struct usb_otg *otg, bool on)
 {
-        struct mv_otg *mvotg = container_of(otg, struct mv_otg, otg);
+        struct mv_otg *mvotg = container_of(otg->phy, struct mv_otg, phy);
        if (mvotg->pdata->set_vbus == NULL)
                return -ENODEV;
        return mvotg->pdata->set_vbus(on);
 }
-static int mv_otg_set_host(struct otg_transceiver *otg,
+static int mv_otg_set_host(struct usb_otg *otg,
                           struct usb_bus *host)
 {
        otg->host = host;
@@ -72,7 +72,7 @@ static int mv_otg_set_host(struct otg_transceiver *otg,
        return 0;
 }
-static int mv_otg_set_peripheral(struct otg_transceiver *otg,
+static int mv_otg_set_peripheral(struct usb_otg *otg,
                                 struct usb_gadget *gadget)
 {
        otg->gadget = gadget;
@@ -203,7 +203,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg)
 static void mv_otg_start_host(struct mv_otg *mvotg, int on)
 {
 #ifdef CONFIG_USB
-        struct otg_transceiver *otg = &mvotg->otg;
+        struct usb_otg *otg = mvotg->phy.otg;
        struct usb_hcd *hcd;
        if (!otg->host)
@@ -222,12 +222,12 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on)
 static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)
 {
-        struct otg_transceiver *otg = &mvotg->otg;
+        struct usb_otg *otg = mvotg->phy.otg;
        if (!otg->gadget)
                return;
-        dev_info(otg->dev, "gadget %s\n", on ? "on" : "off");
+        dev_info(mvotg->phy.dev, "gadget %s\n", on ? "on" : "off");
        if (on)
                usb_gadget_vbus_connect(otg->gadget);
@@ -343,69 +343,69 @@ static void mv_otg_update_inputs(struct mv_otg *mvotg)
 static void mv_otg_update_state(struct mv_otg *mvotg)
 {
        struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl;
-        struct otg_transceiver *otg = &mvotg->otg;
+        struct usb_phy *phy = &mvotg->phy;
-        int old_state = otg->state;
+        int old_state = phy->state;
        switch (old_state) {
        case OTG_STATE_UNDEFINED:
-                otg->state = OTG_STATE_B_IDLE;
+                phy->state = OTG_STATE_B_IDLE;
                /* FALL THROUGH */
        case OTG_STATE_B_IDLE:
                if (otg_ctrl->id == 0)
-                        otg->state = OTG_STATE_A_IDLE;
+                        phy->state = OTG_STATE_A_IDLE;
                else if (otg_ctrl->b_sess_vld)
-                        otg->state = OTG_STATE_B_PERIPHERAL;
+                        phy->state = OTG_STATE_B_PERIPHERAL;
                break;
        case OTG_STATE_B_PERIPHERAL:
                if (!otg_ctrl->b_sess_vld || otg_ctrl->id == 0)
-                        otg->state = OTG_STATE_B_IDLE;
+                        phy->state = OTG_STATE_B_IDLE;
                break;
        case OTG_STATE_A_IDLE:
                if (otg_ctrl->id)
-                        otg->state = OTG_STATE_B_IDLE;
+                        phy->state = OTG_STATE_B_IDLE;
                else if (!(otg_ctrl->a_bus_drop) &&
                         (otg_ctrl->a_bus_req || otg_ctrl->a_srp_det))
-                        otg->state = OTG_STATE_A_WAIT_VRISE;
+                        phy->state = OTG_STATE_A_WAIT_VRISE;
                break;
        case OTG_STATE_A_WAIT_VRISE:
                if (otg_ctrl->a_vbus_vld)
-                        otg->state = OTG_STATE_A_WAIT_BCON;
+                        phy->state = OTG_STATE_A_WAIT_BCON;
                break;
        case OTG_STATE_A_WAIT_BCON:
                if (otg_ctrl->id || otg_ctrl->a_bus_drop
                    || otg_ctrl->a_wait_bcon_timeout) {
                        mv_otg_cancel_timer(mvotg, A_WAIT_BCON_TIMER);
                        mvotg->otg_ctrl.a_wait_bcon_timeout = 0;
-                        otg->state = OTG_STATE_A_WAIT_VFALL;
+                        phy->state = OTG_STATE_A_WAIT_VFALL;
                        otg_ctrl->a_bus_req = 0;
                } else if (!otg_ctrl->a_vbus_vld) {
                        mv_otg_cancel_timer(mvotg, A_WAIT_BCON_TIMER);
                        mvotg->otg_ctrl.a_wait_bcon_timeout = 0;
-                        otg->state = OTG_STATE_A_VBUS_ERR;
+                        phy->state = OTG_STATE_A_VBUS_ERR;
                } else if (otg_ctrl->b_conn) {
                        mv_otg_cancel_timer(mvotg, A_WAIT_BCON_TIMER);
                        mvotg->otg_ctrl.a_wait_bcon_timeout = 0;
-                        otg->state = OTG_STATE_A_HOST;
+                        phy->state = OTG_STATE_A_HOST;
                }
                break;
        case OTG_STATE_A_HOST:
                if (otg_ctrl->id || !otg_ctrl->b_conn
                    || otg_ctrl->a_bus_drop)
-                        otg->state = OTG_STATE_A_WAIT_BCON;
+                        phy->state = OTG_STATE_A_WAIT_BCON;
                else if (!otg_ctrl->a_vbus_vld)
-                        otg->state = OTG_STATE_A_VBUS_ERR;
+                        phy->state = OTG_STATE_A_VBUS_ERR;
                break;
        case OTG_STATE_A_WAIT_VFALL:
                if (otg_ctrl->id
                    || (!otg_ctrl->b_conn && otg_ctrl->a_sess_vld)
                    || otg_ctrl->a_bus_req)
-                        otg->state = OTG_STATE_A_IDLE;
+                        phy->state = OTG_STATE_A_IDLE;
                break;
        case OTG_STATE_A_VBUS_ERR:
                if (otg_ctrl->id || otg_ctrl->a_clr_err
                    || otg_ctrl->a_bus_drop) {
                        otg_ctrl->a_clr_err = 0;
-                        otg->state = OTG_STATE_A_WAIT_VFALL;
+                        phy->state = OTG_STATE_A_WAIT_VFALL;
                }
                break;
        default:
@@ -416,15 +416,17 @@ static void mv_otg_update_state(struct mv_otg *mvotg)
 static void mv_otg_work(struct work_struct *work)
 {
        struct mv_otg *mvotg;
-        struct otg_transceiver *otg;
+        struct usb_phy *phy;
+        struct usb_otg *otg;
        int old_state;
        mvotg = container_of((struct delayed_work *)work, struct mv_otg, work);
 run:
        /* work queue is single thread, or we need spin_lock to protect */
-        otg = &mvotg->otg;
+        phy = &mvotg->phy;
-        old_state = otg->state;
+        otg = phy->otg;
+        old_state = phy->state;
        if (!mvotg->active)
                return;
@@ -432,14 +434,14 @@ run:
        mv_otg_update_inputs(mvotg);
        mv_otg_update_state(mvotg);
-        if (old_state != otg->state) {
+        if (old_state != phy->state) {
                dev_info(&mvotg->pdev->dev, "change from state %s to %s\n",
                         state_string[old_state],
-                         state_string[otg->state]);
+                         state_string[phy->state]);
-                switch (otg->state) {
+                switch (phy->state) {
                case OTG_STATE_B_IDLE:
-                        mvotg->otg.default_a = 0;
+                        otg->default_a = 0;
                        if (old_state == OTG_STATE_B_PERIPHERAL)
                                mv_otg_start_periphrals(mvotg, 0);
                        mv_otg_reset(mvotg);
@@ -450,14 +452,14 @@ run:
                        mv_otg_start_periphrals(mvotg, 1);
                        break;
                case OTG_STATE_A_IDLE:
-                        mvotg->otg.default_a = 1;
+                        otg->default_a = 1;
                        mv_otg_enable(mvotg);
                        if (old_state == OTG_STATE_A_WAIT_VFALL)
                                mv_otg_start_host(mvotg, 0);
                        mv_otg_reset(mvotg);
                        break;
                case OTG_STATE_A_WAIT_VRISE:
-                        mv_otg_set_vbus(&mvotg->otg, 1);
+                        mv_otg_set_vbus(otg, 1);
                        break;
                case OTG_STATE_A_WAIT_BCON:
                        if (old_state != OTG_STATE_A_HOST)
@@ -479,7 +481,7 @@ run:
                         * here. In fact, it need host driver to notify us.
                         */
                        mvotg->otg_ctrl.b_conn = 0;
-                        mv_otg_set_vbus(&mvotg->otg, 0);
+                        mv_otg_set_vbus(otg, 0);
                        break;
                case OTG_STATE_A_VBUS_ERR:
                        break;
@@ -548,8 +550,8 @@ set_a_bus_req(struct device *dev, struct device_attribute *attr,
                return -1;
        /* We will use this interface to change to A device */
-        if (mvotg->otg.state != OTG_STATE_B_IDLE
+        if (mvotg->phy.state != OTG_STATE_B_IDLE
-            && mvotg->otg.state != OTG_STATE_A_IDLE)
+            && mvotg->phy.state != OTG_STATE_A_IDLE)
                return -1;
        /* The clock may disabled and we need to set irq for ID detected */
@@ -579,7 +581,7 @@ set_a_clr_err(struct device *dev, struct device_attribute *attr,
              const char *buf, size_t count)
 {
        struct mv_otg *mvotg = dev_get_drvdata(dev);
-        if (!mvotg->otg.default_a)
+        if (!mvotg->phy.otg->default_a)
                return -1;
        if (count > 2)
@@ -615,7 +617,7 @@ set_a_bus_drop(struct device *dev, struct device_attribute *attr,
               const char *buf, size_t count)
 {
        struct mv_otg *mvotg = dev_get_drvdata(dev);
-        if (!mvotg->otg.default_a)
+        if (!mvotg->phy.otg->default_a)
                return -1;
        if (count > 2)
@@ -688,9 +690,10 @@ int mv_otg_remove(struct platform_device *pdev)
        for (clk_i = 0; clk_i <= mvotg->clknum; clk_i++)
                clk_put(mvotg->clk[clk_i]);
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
        platform_set_drvdata(pdev, NULL);
+        kfree(mvotg->phy.otg);
        kfree(mvotg);
        return 0;
@@ -700,6 +703,7 @@ static int mv_otg_probe(struct platform_device *pdev)
 {
        struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
        struct mv_otg *mvotg;
+        struct usb_otg *otg;
        struct resource *r;
        int retval = 0, clk_i, i;
        size_t size;
@@ -716,6 +720,12 @@ static int mv_otg_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
+        otg = kzalloc(sizeof *otg, GFP_KERNEL);
+        if (!otg) {
+                kfree(mvotg);
+                return -ENOMEM;
+        }
        platform_set_drvdata(pdev, mvotg);
        mvotg->pdev = pdev;
@@ -741,12 +751,15 @@ static int mv_otg_probe(struct platform_device *pdev)
        /* OTG common part */
        mvotg->pdev = pdev;
-        mvotg->otg.dev = &pdev->dev;
+        mvotg->phy.dev = &pdev->dev;
-        mvotg->otg.label = driver_name;
+        mvotg->phy.otg = otg;
-        mvotg->otg.set_host = mv_otg_set_host;
+        mvotg->phy.label = driver_name;
-        mvotg->otg.set_peripheral = mv_otg_set_peripheral;
+        mvotg->phy.state = OTG_STATE_UNDEFINED;
-        mvotg->otg.set_vbus = mv_otg_set_vbus;
-        mvotg->otg.state = OTG_STATE_UNDEFINED;
+        otg->phy = &mvotg->phy;
+        otg->set_host = mv_otg_set_host;
+        otg->set_peripheral = mv_otg_set_peripheral;
+        otg->set_vbus = mv_otg_set_vbus;
        for (i = 0; i < OTG_TIMER_NUM; i++)
                init_timer(&mvotg->otg_ctrl.timer[i]);
@@ -840,7 +853,7 @@ static int mv_otg_probe(struct platform_device *pdev)
                goto err_disable_clk;
        }
-        retval = otg_set_transceiver(&mvotg->otg);
+        retval = usb_set_transceiver(&mvotg->phy);
        if (retval < 0) {
                dev_err(&pdev->dev, "can't register transceiver, %d\n",
                        retval);
@@ -867,7 +880,7 @@ static int mv_otg_probe(struct platform_device *pdev)
        return 0;
 err_set_transceiver:
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
 err_free_irq:
        free_irq(mvotg->irq, mvotg);
 err_disable_clk:
@@ -888,6 +901,7 @@ err_put_clk:
                clk_put(mvotg->clk[clk_i]);
        platform_set_drvdata(pdev, NULL);
+        kfree(otg);
        kfree(mvotg);
        return retval;
@@ -898,10 +912,10 @@ static int mv_otg_suspend(struct platform_device *pdev, pm_message_t state)
 {
        struct mv_otg *mvotg = platform_get_drvdata(pdev);
-        if (mvotg->otg.state != OTG_STATE_B_IDLE) {
+        if (mvotg->phy.state != OTG_STATE_B_IDLE) {
                dev_info(&pdev->dev,
                         "OTG state is not B_IDLE, it is %d!\n",
-                         mvotg->otg.state);
+                         mvotg->phy.state);
                return -EAGAIN;
        }
diff --git a/drivers/usb/otg/mv_otg.h b/drivers/usb/otg/mv_otg.h
index be6ca143764..8a9e351b36b 100644
--- a/drivers/usb/otg/mv_otg.h
+++ b/drivers/usb/otg/mv_otg.h
@@ -136,7 +136,7 @@ struct mv_otg_regs {
 };
 struct mv_otg {
-        struct otg_transceiver otg;
+        struct usb_phy phy;
        struct mv_otg_ctrl otg_ctrl;
        /* base address */
diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c
index c1e36004643..58b26df6afd 100644
--- a/drivers/usb/otg/nop-usb-xceiv.c
+++ b/drivers/usb/otg/nop-usb-xceiv.c
@@ -33,7 +33,7 @@
 #include <linux/slab.h>
 struct nop_usb_xceiv {
-        struct otg_transceiver  otg;
+        struct usb_phy          phy;
        struct device           *dev;
 };
@@ -58,51 +58,37 @@ void usb_nop_xceiv_unregister(void)
 }
 EXPORT_SYMBOL(usb_nop_xceiv_unregister);
-static inline struct nop_usb_xceiv *xceiv_to_nop(struct otg_transceiver *x)
+static int nop_set_suspend(struct usb_phy *x, int suspend)
-{
-        return container_of(x, struct nop_usb_xceiv, otg);
-}
-static int nop_set_suspend(struct otg_transceiver *x, int suspend)
 {
        return 0;
 }
-static int nop_set_peripheral(struct otg_transceiver *x,
+static int nop_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
-                struct usb_gadget *gadget)
 {
-        struct nop_usb_xceiv *nop;
+        if (!otg)
-        if (!x)
                return -ENODEV;
-        nop = xceiv_to_nop(x);
        if (!gadget) {
-                nop->otg.gadget = NULL;
+                otg->gadget = NULL;
                return -ENODEV;
        }
-        nop->otg.gadget = gadget;
+        otg->gadget = gadget;
-        nop->otg.state = OTG_STATE_B_IDLE;
+        otg->phy->state = OTG_STATE_B_IDLE;
        return 0;
 }
-static int nop_set_host(struct otg_transceiver *x, struct usb_bus *host)
+static int nop_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct nop_usb_xceiv *nop;
+        if (!otg)
-        if (!x)
                return -ENODEV;
-        nop = xceiv_to_nop(x);
        if (!host) {
-                nop->otg.host = NULL;
+                otg->host = NULL;
                return -ENODEV;
        }
-        nop->otg.host = host;
+        otg->host = host;
        return 0;
 }
@@ -115,15 +101,23 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev)
        if (!nop)
                return -ENOMEM;
+        nop->phy.otg = kzalloc(sizeof *nop->phy.otg, GFP_KERNEL);
+        if (!nop->phy.otg) {
+                kfree(nop);
+                return -ENOMEM;
+        }
        nop->dev                = &pdev->dev;
-        nop->otg.dev            = nop->dev;
+        nop->phy.dev            = nop->dev;
-        nop->otg.label          = "nop-xceiv";
+        nop->phy.label          = "nop-xceiv";
-        nop->otg.state          = OTG_STATE_UNDEFINED;
+        nop->phy.set_suspend    = nop_set_suspend;
-        nop->otg.set_host       = nop_set_host;
+        nop->phy.state          = OTG_STATE_UNDEFINED;
-        nop->otg.set_peripheral = nop_set_peripheral;
-        nop->otg.set_suspend    = nop_set_suspend;
+        nop->phy.otg->phy               = &nop->phy;
+        nop->phy.otg->set_host          = nop_set_host;
-        err = otg_set_transceiver(&nop->otg);
+        nop->phy.otg->set_peripheral    = nop_set_peripheral;
+        err = usb_set_transceiver(&nop->phy);
        if (err) {
                dev_err(&pdev->dev, "can't register transceiver, err: %d\n",
                        err);
@@ -132,10 +126,11 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, nop);
-        ATOMIC_INIT_NOTIFIER_HEAD(&nop->otg.notifier);
+        ATOMIC_INIT_NOTIFIER_HEAD(&nop->phy.notifier);
        return 0;
 exit:
+        kfree(nop->phy.otg);
        kfree(nop);
        return err;
 }
@@ -144,9 +139,10 @@ static int __devexit nop_usb_xceiv_remove(struct platform_device *pdev)
 {
        struct nop_usb_xceiv *nop = platform_get_drvdata(pdev);
-        otg_set_transceiver(NULL);
+        usb_set_transceiver(NULL);
        platform_set_drvdata(pdev, NULL);
+        kfree(nop->phy.otg);
        kfree(nop);
        return 0;
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index 307c27bc51e..801e597a154 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -15,56 +15,56 @@
 #include <linux/usb/otg.h>
-static struct otg_transceiver *xceiv;
+static struct usb_phy *phy;
 /**
- * otg_get_transceiver - find the (single) OTG transceiver
+ * usb_get_transceiver - find the (single) USB transceiver
 *
 * Returns the transceiver driver, after getting a refcount to it; or
 * null if there is no such transceiver.  The caller is responsible for
- * calling otg_put_transceiver() to release that count.
+ * calling usb_put_transceiver() to release that count.
 *
 * For use by USB host and peripheral drivers.
 */
-struct otg_transceiver *otg_get_transceiver(void)
+struct usb_phy *usb_get_transceiver(void)
 {
-        if (xceiv)
+        if (phy)
-                get_device(xceiv->dev);
+                get_device(phy->dev);
-        return xceiv;
+        return phy;
 }
-EXPORT_SYMBOL(otg_get_transceiver);
+EXPORT_SYMBOL(usb_get_transceiver);
 /**
- * otg_put_transceiver - release the (single) OTG transceiver
+ * usb_put_transceiver - release the (single) USB transceiver
- * @x: the transceiver returned by otg_get_transceiver()
+ * @x: the transceiver returned by usb_get_transceiver()
 *
- * Releases a refcount the caller received from otg_get_transceiver().
+ * Releases a refcount the caller received from usb_get_transceiver().
 *
 * For use by USB host and peripheral drivers.
 */
-void otg_put_transceiver(struct otg_transceiver *x)
+void usb_put_transceiver(struct usb_phy *x)
 {
        if (x)
                put_device(x->dev);
 }
-EXPORT_SYMBOL(otg_put_transceiver);
+EXPORT_SYMBOL(usb_put_transceiver);
 /**
- * otg_set_transceiver - declare the (single) OTG transceiver
+ * usb_set_transceiver - declare the (single) USB transceiver
- * @x: the USB OTG transceiver to be used; or NULL
+ * @x: the USB transceiver to be used; or NULL
 *
 * This call is exclusively for use by transceiver drivers, which
 * coordinate the activities of drivers for host and peripheral
 * controllers, and in some cases for VBUS current regulation.
 */
-int otg_set_transceiver(struct otg_transceiver *x)
+int usb_set_transceiver(struct usb_phy *x)
 {
-        if (xceiv && x)
+        if (phy && x)
                return -EBUSY;
-        xceiv = x;
+        phy = x;
        return 0;
 }
-EXPORT_SYMBOL(otg_set_transceiver);
+EXPORT_SYMBOL(usb_set_transceiver);
 const char *otg_state_string(enum usb_otg_state state)
 {
diff --git a/drivers/usb/otg/otg_fsm.c b/drivers/usb/otg/otg_fsm.c
index 09117387d2a..ade131a8ae5 100644
--- a/drivers/usb/otg/otg_fsm.c
+++ b/drivers/usb/otg/otg_fsm.c
@@ -117,10 +117,10 @@ void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state)
 int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
 {
        state_changed = 1;
-        if (fsm->transceiver->state == new_state)
+        if (fsm->otg->phy->state == new_state)
                return 0;
        VDBG("Set state: %s\n", otg_state_string(new_state));
-        otg_leave_state(fsm, fsm->transceiver->state);
+        otg_leave_state(fsm, fsm->otg->phy->state);
        switch (new_state) {
        case OTG_STATE_B_IDLE:
                otg_drv_vbus(fsm, 0);
@@ -155,8 +155,8 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
                otg_loc_conn(fsm, 0);
                otg_loc_sof(fsm, 1);
                otg_set_protocol(fsm, PROTO_HOST);
-                usb_bus_start_enum(fsm->transceiver->host,
+                usb_bus_start_enum(fsm->otg->host,
-                                fsm->transceiver->host->otg_port);
+                                fsm->otg->host->otg_port);
                break;
        case OTG_STATE_A_IDLE:
                otg_drv_vbus(fsm, 0);
@@ -221,7 +221,7 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
                break;
        }
-        fsm->transceiver->state = new_state;
+        fsm->otg->phy->state = new_state;
        return 0;
 }
@@ -233,7 +233,7 @@ int otg_statemachine(struct otg_fsm *fsm)
        spin_lock_irqsave(&fsm->lock, flags);
-        state = fsm->transceiver->state;
+        state = fsm->otg->phy->state;
        state_changed = 0;
        /* State machine state change judgement */
@@ -248,7 +248,7 @@ int otg_statemachine(struct otg_fsm *fsm)
        case OTG_STATE_B_IDLE:
                if (!fsm->id)
                        otg_set_state(fsm, OTG_STATE_A_IDLE);
-                else if (fsm->b_sess_vld && fsm->transceiver->gadget)
+                else if (fsm->b_sess_vld && fsm->otg->gadget)
                        otg_set_state(fsm, OTG_STATE_B_PERIPHERAL);
                else if (fsm->b_bus_req && fsm->b_sess_end && fsm->b_se0_srp)
                        otg_set_state(fsm, OTG_STATE_B_SRP_INIT);
@@ -260,7 +260,7 @@ int otg_statemachine(struct otg_fsm *fsm)
        case OTG_STATE_B_PERIPHERAL:
                if (!fsm->id || !fsm->b_sess_vld)
                        otg_set_state(fsm, OTG_STATE_B_IDLE);
-                else if (fsm->b_bus_req && fsm->transceiver->
+                else if (fsm->b_bus_req && fsm->otg->
                                gadget->b_hnp_enable && fsm->a_bus_suspend)
                        otg_set_state(fsm, OTG_STATE_B_WAIT_ACON);
                break;
@@ -302,7 +302,7 @@ int otg_statemachine(struct otg_fsm *fsm)
                break;
        case OTG_STATE_A_HOST:
                if ((!fsm->a_bus_req || fsm->a_suspend_req) &&
-                                fsm->transceiver->host->b_hnp_enable)
+                                fsm->otg->host->b_hnp_enable)
                        otg_set_state(fsm, OTG_STATE_A_SUSPEND);
                else if (fsm->id || !fsm->b_conn || fsm->a_bus_drop)
                        otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
@@ -310,9 +310,9 @@ int otg_statemachine(struct otg_fsm *fsm)
                        otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
                break;
        case OTG_STATE_A_SUSPEND:
-                if (!fsm->b_conn && fsm->transceiver->host->b_hnp_enable)
+                if (!fsm->b_conn && fsm->otg->host->b_hnp_enable)
                        otg_set_state(fsm, OTG_STATE_A_PERIPHERAL);
-                else if (!fsm->b_conn && !fsm->transceiver->host->b_hnp_enable)
+                else if (!fsm->b_conn && !fsm->otg->host->b_hnp_enable)
                        otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
                else if (fsm->a_bus_req || fsm->b_bus_resume)
                        otg_set_state(fsm, OTG_STATE_A_HOST);
diff --git a/drivers/usb/otg/otg_fsm.h b/drivers/usb/otg/otg_fsm.h
index 0cecf1d593a..c30a2e1d9e4 100644
--- a/drivers/usb/otg/otg_fsm.h
+++ b/drivers/usb/otg/otg_fsm.h
@@ -82,7 +82,7 @@ struct otg_fsm {
        int loc_sof;
        struct otg_fsm_ops *ops;
-        struct otg_transceiver *transceiver;
+        struct usb_otg *otg;
        /* Current usb protocol used: 0:undefine; 1:host; 2:client */
        int protocol;
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 14f66c35862..c4a86da858e 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -144,7 +144,7 @@
 #define GPIO_USB_4PIN_ULPI_2430C        (3 << 0)
 struct twl4030_usb {
-        struct otg_transceiver  otg;
+        struct usb_phy          phy;
        struct device           *dev;
        /* TWL4030 internal USB regulator supplies */
@@ -166,7 +166,7 @@ struct twl4030_usb {
 };
 /* internal define on top of container_of */
-#define xceiv_to_twl(x)         container_of((x), struct twl4030_usb, otg)
+#define phy_to_twl(x)           container_of((x), struct twl4030_usb, phy)
 /*-------------------------------------------------------------------------*/
@@ -246,10 +246,11 @@ twl4030_usb_clear_bits(struct twl4030_usb *twl, u8 reg, u8 bits)
 /*-------------------------------------------------------------------------*/
-static enum usb_xceiv_events twl4030_usb_linkstat(struct twl4030_usb *twl)
+static enum usb_phy_events twl4030_usb_linkstat(struct twl4030_usb *twl)
 {
        int     status;
        int     linkstat = USB_EVENT_NONE;
+        struct usb_otg *otg = twl->phy.otg;
        twl->vbus_supplied = false;
@@ -281,7 +282,7 @@ static enum usb_xceiv_events twl4030_usb_linkstat(struct twl4030_usb *twl)
        dev_dbg(twl->dev, "HW_CONDITIONS 0x%02x/%d; link %d\n",
                        status, status, linkstat);
-        twl->otg.last_event = linkstat;
+        twl->phy.last_event = linkstat;
        /* REVISIT this assumes host and peripheral controllers
         * are registered, and that both are active...
@@ -290,11 +291,11 @@ static enum usb_xceiv_events twl4030_usb_linkstat(struct twl4030_usb *twl)
        spin_lock_irq(&twl->lock);
        twl->linkstat = linkstat;
        if (linkstat == USB_EVENT_ID) {
-                twl->otg.default_a = true;
+                otg->default_a = true;
-                twl->otg.state = OTG_STATE_A_IDLE;
+                twl->phy.state = OTG_STATE_A_IDLE;
        } else {
-                twl->otg.default_a = false;
+                otg->default_a = false;
-                twl->otg.state = OTG_STATE_B_IDLE;
+                twl->phy.state = OTG_STATE_B_IDLE;
        }
        spin_unlock_irq(&twl->lock);
@@ -520,8 +521,8 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
                else
                        twl4030_phy_resume(twl);
-                atomic_notifier_call_chain(&twl->otg.notifier, status,
+                atomic_notifier_call_chain(&twl->phy.notifier, status,
-                                twl->otg.gadget);
+                                twl->phy.otg->gadget);
        }
        sysfs_notify(&twl->dev->kobj, NULL, "vbus");
@@ -542,15 +543,15 @@ static void twl4030_usb_phy_init(struct twl4030_usb *twl)
                        twl->asleep = 0;
                }
-                atomic_notifier_call_chain(&twl->otg.notifier, status,
+                atomic_notifier_call_chain(&twl->phy.notifier, status,
-                                twl->otg.gadget);
+                                twl->phy.otg->gadget);
        }
        sysfs_notify(&twl->dev->kobj, NULL, "vbus");
 }
-static int twl4030_set_suspend(struct otg_transceiver *x, int suspend)
+static int twl4030_set_suspend(struct usb_phy *x, int suspend)
 {
-        struct twl4030_usb *twl = xceiv_to_twl(x);
+        struct twl4030_usb *twl = phy_to_twl(x);
        if (suspend)
                twl4030_phy_suspend(twl, 1);
@@ -560,33 +561,27 @@ static int twl4030_set_suspend(struct otg_transceiver *x, int suspend)
        return 0;
 }
-static int twl4030_set_peripheral(struct otg_transceiver *x,
+static int twl4030_set_peripheral(struct usb_otg *otg,
-                struct usb_gadget *gadget)
+                                        struct usb_gadget *gadget)
 {
-        struct twl4030_usb *twl;
+        if (!otg)
-        if (!x)
                return -ENODEV;
-        twl = xceiv_to_twl(x);
+        otg->gadget = gadget;
-        twl->otg.gadget = gadget;
        if (!gadget)
-                twl->otg.state = OTG_STATE_UNDEFINED;
+                otg->phy->state = OTG_STATE_UNDEFINED;
        return 0;
 }
-static int twl4030_set_host(struct otg_transceiver *x, struct usb_bus *host)
+static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct twl4030_usb *twl;
+        if (!otg)
-        if (!x)
                return -ENODEV;
-        twl = xceiv_to_twl(x);
+        otg->host = host;
-        twl->otg.host = host;
        if (!host)
-                twl->otg.state = OTG_STATE_UNDEFINED;
+                otg->phy->state = OTG_STATE_UNDEFINED;
        return 0;
 }
@@ -596,6 +591,7 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
        struct twl4030_usb_data *pdata = pdev->dev.platform_data;
        struct twl4030_usb      *twl;
        int                     status, err;
+        struct usb_otg          *otg;
        if (!pdata) {
                dev_dbg(&pdev->dev, "platform_data not available\n");
@@ -606,16 +602,26 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
        if (!twl)
                return -ENOMEM;
+        otg = kzalloc(sizeof *otg, GFP_KERNEL);
+        if (!otg) {
+                kfree(twl);
+                return -ENOMEM;
+        }
        twl->dev                = &pdev->dev;
        twl->irq                = platform_get_irq(pdev, 0);
-        twl->otg.dev            = twl->dev;
-        twl->otg.label          = "twl4030";
-        twl->otg.set_host       = twl4030_set_host;
-        twl->otg.set_peripheral = twl4030_set_peripheral;
-        twl->otg.set_suspend    = twl4030_set_suspend;
        twl->usb_mode           = pdata->usb_mode;
        twl->vbus_supplied      = false;
-        twl->asleep = 1;
+        twl->asleep             = 1;
+        twl->phy.dev            = twl->dev;
+        twl->phy.label          = "twl4030";
+        twl->phy.otg            = otg;
+        twl->phy.set_suspend    = twl4030_set_suspend;
+        otg->phy                = &twl->phy;
+        otg->set_host           = twl4030_set_host;
+        otg->set_peripheral     = twl4030_set_peripheral;
        /* init spinlock for workqueue */
        spin_lock_init(&twl->lock);
@@ -623,16 +629,17 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
        err = twl4030_usb_ldo_init(twl);
        if (err) {
                dev_err(&pdev->dev, "ldo init failed\n");
+                kfree(otg);
                kfree(twl);
                return err;
        }
-        otg_set_transceiver(&twl->otg);
+        usb_set_transceiver(&twl->phy);
        platform_set_drvdata(pdev, twl);
        if (device_create_file(&pdev->dev, &dev_attr_vbus))
                dev_warn(&pdev->dev, "could not create sysfs file\n");
-        ATOMIC_INIT_NOTIFIER_HEAD(&twl->otg.notifier);
+        ATOMIC_INIT_NOTIFIER_HEAD(&twl->phy.notifier);
        /* Our job is to use irqs and status from the power module
         * to keep the transceiver disabled when nothing's connected.
@@ -649,6 +656,7 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
        if (status < 0) {
                dev_dbg(&pdev->dev, "can't get IRQ %d, err %d\n",
                        twl->irq, status);
+                kfree(otg);
                kfree(twl);
                return status;
        }
@@ -693,6 +701,7 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)
        regulator_put(twl->usb1v8);
        regulator_put(twl->usb3v1);
+        kfree(twl->phy.otg);
        kfree(twl);
        return 0;
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index ed2b26cfe81..e3fa387ca81 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -87,7 +87,7 @@
 #define VBUS_DET                        BIT(2)
 struct twl6030_usb {
-        struct otg_transceiver  otg;
+        struct usb_phy          phy;
        struct device           *dev;
        /* for vbus reporting with irqs disabled */
@@ -107,7 +107,7 @@ struct twl6030_usb {
        unsigned long           features;
 };
-#define xceiv_to_twl(x)         container_of((x), struct twl6030_usb, otg)
+#define phy_to_twl(x)           container_of((x), struct twl6030_usb, phy)
 /*-------------------------------------------------------------------------*/
@@ -137,13 +137,13 @@ static inline u8 twl6030_readb(struct twl6030_usb *twl, u8 module, u8 address)
        return ret;
 }
-static int twl6030_phy_init(struct otg_transceiver *x)
+static int twl6030_phy_init(struct usb_phy *x)
 {
        struct twl6030_usb *twl;
        struct device *dev;
        struct twl4030_usb_data *pdata;
-        twl = xceiv_to_twl(x);
+        twl = phy_to_twl(x);
        dev  = twl->dev;
        pdata = dev->platform_data;
@@ -155,21 +155,21 @@ static int twl6030_phy_init(struct otg_transceiver *x)
        return 0;
 }
-static void twl6030_phy_shutdown(struct otg_transceiver *x)
+static void twl6030_phy_shutdown(struct usb_phy *x)
 {
        struct twl6030_usb *twl;
        struct device *dev;
        struct twl4030_usb_data *pdata;
-        twl = xceiv_to_twl(x);
+        twl = phy_to_twl(x);
        dev  = twl->dev;
        pdata = dev->platform_data;
        pdata->phy_power(twl->dev, 0, 0);
 }
-static int twl6030_phy_suspend(struct otg_transceiver *x, int suspend)
+static int twl6030_phy_suspend(struct usb_phy *x, int suspend)
 {
-        struct twl6030_usb *twl = xceiv_to_twl(x);
+        struct twl6030_usb *twl = phy_to_twl(x);
        struct device *dev = twl->dev;
        struct twl4030_usb_data *pdata = dev->platform_data;
@@ -178,9 +178,9 @@ static int twl6030_phy_suspend(struct otg_transceiver *x, int suspend)
        return 0;
 }
-static int twl6030_start_srp(struct otg_transceiver *x)
+static int twl6030_start_srp(struct usb_otg *otg)
 {
-        struct twl6030_usb *twl = xceiv_to_twl(x);
+        struct twl6030_usb *twl = phy_to_twl(otg->phy);
        twl6030_writeb(twl, TWL_MODULE_USB, 0x24, USB_VBUS_CTRL_SET);
        twl6030_writeb(twl, TWL_MODULE_USB, 0x84, USB_VBUS_CTRL_SET);
@@ -256,6 +256,7 @@ static DEVICE_ATTR(vbus, 0444, twl6030_usb_vbus_show, NULL);
 static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
 {
        struct twl6030_usb *twl = _twl;
+        struct usb_otg *otg = twl->phy.otg;
        int status;
        u8 vbus_state, hw_state;
@@ -268,18 +269,18 @@ static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
                        regulator_enable(twl->usb3v3);
                        twl->asleep = 1;
                        status = USB_EVENT_VBUS;
-                        twl->otg.default_a = false;
+                        otg->default_a = false;
-                        twl->otg.state = OTG_STATE_B_IDLE;
+                        twl->phy.state = OTG_STATE_B_IDLE;
                        twl->linkstat = status;
-                        twl->otg.last_event = status;
+                        twl->phy.last_event = status;
-                        atomic_notifier_call_chain(&twl->otg.notifier,
+                        atomic_notifier_call_chain(&twl->phy.notifier,
-                                                status, twl->otg.gadget);
+                                                status, otg->gadget);
                } else {
                        status = USB_EVENT_NONE;
                        twl->linkstat = status;
-                        twl->otg.last_event = status;
+                        twl->phy.last_event = status;
-                        atomic_notifier_call_chain(&twl->otg.notifier,
+                        atomic_notifier_call_chain(&twl->phy.notifier,
-                                                status, twl->otg.gadget);
+                                                status, otg->gadget);
                        if (twl->asleep) {
                                regulator_disable(twl->usb3v3);
                                twl->asleep = 0;
@@ -294,6 +295,7 @@ static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
 static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
 {
        struct twl6030_usb *twl = _twl;
+        struct usb_otg *otg = twl->phy.otg;
        int status = USB_EVENT_NONE;
        u8 hw_state;
@@ -307,12 +309,12 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
                twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET,
                                                                0x10);
                status = USB_EVENT_ID;
-                twl->otg.default_a = true;
+                otg->default_a = true;
-                twl->otg.state = OTG_STATE_A_IDLE;
+                twl->phy.state = OTG_STATE_A_IDLE;
                twl->linkstat = status;
-                twl->otg.last_event = status;
+                twl->phy.last_event = status;
-                atomic_notifier_call_chain(&twl->otg.notifier, status,
+                atomic_notifier_call_chain(&twl->phy.notifier, status,
-                                                        twl->otg.gadget);
+                                                        otg->gadget);
        } else  {
                twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_CLR,
                                                                0x10);
@@ -324,25 +326,22 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
        return IRQ_HANDLED;
 }
-static int twl6030_set_peripheral(struct otg_transceiver *x,
+static int twl6030_set_peripheral(struct usb_otg *otg,
                struct usb_gadget *gadget)
 {
-        struct twl6030_usb *twl;
+        if (!otg)
-        if (!x)
                return -ENODEV;
-        twl = xceiv_to_twl(x);
+        otg->gadget = gadget;
-        twl->otg.gadget = gadget;
        if (!gadget)
-                twl->otg.state = OTG_STATE_UNDEFINED;
+                otg->phy->state = OTG_STATE_UNDEFINED;
        return 0;
 }
-static int twl6030_enable_irq(struct otg_transceiver *x)
+static int twl6030_enable_irq(struct usb_phy *x)
 {
-        struct twl6030_usb *twl = xceiv_to_twl(x);
+        struct twl6030_usb *twl = phy_to_twl(x);
        twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET, 0x1);
        twl6030_interrupt_unmask(0x05, REG_INT_MSK_LINE_C);
@@ -376,9 +375,9 @@ static void otg_set_vbus_work(struct work_struct *data)
                                                        CHARGERUSB_CTRL1);
 }
-static int twl6030_set_vbus(struct otg_transceiver *x, bool enabled)
+static int twl6030_set_vbus(struct usb_otg *otg, bool enabled)
 {
-        struct twl6030_usb *twl = xceiv_to_twl(x);
+        struct twl6030_usb *twl = phy_to_twl(otg->phy);
        twl->vbus_enable = enabled;
        schedule_work(&twl->set_vbus_work);
@@ -386,17 +385,14 @@ static int twl6030_set_vbus(struct otg_transceiver *x, bool enabled)
        return 0;
 }
-static int twl6030_set_host(struct otg_transceiver *x, struct usb_bus *host)
+static int twl6030_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct twl6030_usb *twl;
+        if (!otg)
-        if (!x)
                return -ENODEV;
-        twl = xceiv_to_twl(x);
+        otg->host = host;
-        twl->otg.host = host;
        if (!host)
-                twl->otg.state = OTG_STATE_UNDEFINED;
+                otg->phy->state = OTG_STATE_UNDEFINED;
        return 0;
 }
@@ -405,6 +401,7 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
        struct twl6030_usb      *twl;
        int                     status, err;
        struct twl4030_usb_data *pdata;
+        struct usb_otg          *otg;
        struct device *dev = &pdev->dev;
        pdata = dev->platform_data;
@@ -412,19 +409,29 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
        if (!twl)
                return -ENOMEM;
+        otg = kzalloc(sizeof *otg, GFP_KERNEL);
+        if (!otg) {
+                kfree(twl);
+                return -ENOMEM;
+        }
        twl->dev                = &pdev->dev;
        twl->irq1               = platform_get_irq(pdev, 0);
        twl->irq2               = platform_get_irq(pdev, 1);
        twl->features           = pdata->features;
-        twl->otg.dev            = twl->dev;
-        twl->otg.label          = "twl6030";
+        twl->phy.dev            = twl->dev;
-        twl->otg.set_host       = twl6030_set_host;
+        twl->phy.label          = "twl6030";
-        twl->otg.set_peripheral = twl6030_set_peripheral;
+        twl->phy.otg            = otg;
-        twl->otg.set_vbus       = twl6030_set_vbus;
+        twl->phy.init           = twl6030_phy_init;
-        twl->otg.init           = twl6030_phy_init;
+        twl->phy.shutdown       = twl6030_phy_shutdown;
-        twl->otg.shutdown       = twl6030_phy_shutdown;
+        twl->phy.set_suspend    = twl6030_phy_suspend;
-        twl->otg.set_suspend    = twl6030_phy_suspend;
-        twl->otg.start_srp      = twl6030_start_srp;
+        otg->phy                = &twl->phy;
+        otg->set_host           = twl6030_set_host;
+        otg->set_peripheral     = twl6030_set_peripheral;
+        otg->set_vbus           = twl6030_set_vbus;
+        otg->start_srp          = twl6030_start_srp;
        /* init spinlock for workqueue */
        spin_lock_init(&twl->lock);
@@ -432,16 +439,17 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
        err = twl6030_usb_ldo_init(twl);
        if (err) {
                dev_err(&pdev->dev, "ldo init failed\n");
+                kfree(otg);
                kfree(twl);
                return err;
        }
-        otg_set_transceiver(&twl->otg);
+        usb_set_transceiver(&twl->phy);
        platform_set_drvdata(pdev, twl);
        if (device_create_file(&pdev->dev, &dev_attr_vbus))
                dev_warn(&pdev->dev, "could not create sysfs file\n");
-        ATOMIC_INIT_NOTIFIER_HEAD(&twl->otg.notifier);
+        ATOMIC_INIT_NOTIFIER_HEAD(&twl->phy.notifier);
        INIT_WORK(&twl->set_vbus_work, otg_set_vbus_work);
@@ -453,6 +461,7 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
                        twl->irq1, status);
                device_remove_file(twl->dev, &dev_attr_vbus);
+                kfree(otg);
                kfree(twl);
                return status;
        }
@@ -465,14 +474,15 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
                        twl->irq2, status);
                free_irq(twl->irq1, twl);
                device_remove_file(twl->dev, &dev_attr_vbus);
+                kfree(otg);
                kfree(twl);
                return status;
        }
        twl->asleep = 0;
        pdata->phy_init(dev);
-        twl6030_phy_suspend(&twl->otg, 0);
+        twl6030_phy_suspend(&twl->phy, 0);
-        twl6030_enable_irq(&twl->otg);
+        twl6030_enable_irq(&twl->phy);
        dev_info(&pdev->dev, "Initialized TWL6030 USB module\n");
        return 0;
@@ -496,6 +506,7 @@ static int __exit twl6030_usb_remove(struct platform_device *pdev)
        pdata->phy_exit(twl->dev);
        device_remove_file(twl->dev, &dev_attr_vbus);
        cancel_work_sync(&twl->set_vbus_work);
+        kfree(twl->phy.otg);
        kfree(twl);
        return 0;
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 0b0466728fd..217339dd7a9 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -49,31 +49,31 @@ static struct ulpi_info ulpi_ids[] = {
        ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
 };
-static int ulpi_set_otg_flags(struct otg_transceiver *otg)
+static int ulpi_set_otg_flags(struct usb_phy *phy)
 {
        unsigned int flags = ULPI_OTG_CTRL_DP_PULLDOWN |
                             ULPI_OTG_CTRL_DM_PULLDOWN;
-        if (otg->flags & ULPI_OTG_ID_PULLUP)
+        if (phy->flags & ULPI_OTG_ID_PULLUP)
                flags |= ULPI_OTG_CTRL_ID_PULLUP;
        /*
         * ULPI Specification rev.1.1 default
         * for Dp/DmPulldown is enabled.
         */
-        if (otg->flags & ULPI_OTG_DP_PULLDOWN_DIS)
+        if (phy->flags & ULPI_OTG_DP_PULLDOWN_DIS)
                flags &= ~ULPI_OTG_CTRL_DP_PULLDOWN;
-        if (otg->flags & ULPI_OTG_DM_PULLDOWN_DIS)
+        if (phy->flags & ULPI_OTG_DM_PULLDOWN_DIS)
                flags &= ~ULPI_OTG_CTRL_DM_PULLDOWN;
-        if (otg->flags & ULPI_OTG_EXTVBUSIND)
+        if (phy->flags & ULPI_OTG_EXTVBUSIND)
                flags |= ULPI_OTG_CTRL_EXTVBUSIND;
-        return otg_io_write(otg, flags, ULPI_OTG_CTRL);
+        return usb_phy_io_write(phy, flags, ULPI_OTG_CTRL);
 }
-static int ulpi_set_fc_flags(struct otg_transceiver *otg)
+static int ulpi_set_fc_flags(struct usb_phy *phy)
 {
        unsigned int flags = 0;
@@ -81,27 +81,27 @@ static int ulpi_set_fc_flags(struct otg_transceiver *otg)
         * ULPI Specification rev.1.1 default
         * for XcvrSelect is Full Speed.
         */
-        if (otg->flags & ULPI_FC_HS)
+        if (phy->flags & ULPI_FC_HS)
                flags |= ULPI_FUNC_CTRL_HIGH_SPEED;
-        else if (otg->flags & ULPI_FC_LS)
+        else if (phy->flags & ULPI_FC_LS)
                flags |= ULPI_FUNC_CTRL_LOW_SPEED;
-        else if (otg->flags & ULPI_FC_FS4LS)
+        else if (phy->flags & ULPI_FC_FS4LS)
                flags |= ULPI_FUNC_CTRL_FS4LS;
        else
                flags |= ULPI_FUNC_CTRL_FULL_SPEED;
-        if (otg->flags & ULPI_FC_TERMSEL)
+        if (phy->flags & ULPI_FC_TERMSEL)
                flags |= ULPI_FUNC_CTRL_TERMSELECT;
        /*
         * ULPI Specification rev.1.1 default
         * for OpMode is Normal Operation.
         */
-        if (otg->flags & ULPI_FC_OP_NODRV)
+        if (phy->flags & ULPI_FC_OP_NODRV)
                flags |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-        else if (otg->flags & ULPI_FC_OP_DIS_NRZI)
+        else if (phy->flags & ULPI_FC_OP_DIS_NRZI)
                flags |= ULPI_FUNC_CTRL_OPMODE_DISABLE_NRZI;
-        else if (otg->flags & ULPI_FC_OP_NSYNC_NEOP)
+        else if (phy->flags & ULPI_FC_OP_NSYNC_NEOP)
                flags |= ULPI_FUNC_CTRL_OPMODE_NOSYNC_NOEOP;
        else
                flags |= ULPI_FUNC_CTRL_OPMODE_NORMAL;
@@ -112,54 +112,54 @@ static int ulpi_set_fc_flags(struct otg_transceiver *otg)
         */
        flags |= ULPI_FUNC_CTRL_SUSPENDM;
-        return otg_io_write(otg, flags, ULPI_FUNC_CTRL);
+        return usb_phy_io_write(phy, flags, ULPI_FUNC_CTRL);
 }
-static int ulpi_set_ic_flags(struct otg_transceiver *otg)
+static int ulpi_set_ic_flags(struct usb_phy *phy)
 {
        unsigned int flags = 0;
-        if (otg->flags & ULPI_IC_AUTORESUME)
+        if (phy->flags & ULPI_IC_AUTORESUME)
                flags |= ULPI_IFC_CTRL_AUTORESUME;
-        if (otg->flags & ULPI_IC_EXTVBUS_INDINV)
+        if (phy->flags & ULPI_IC_EXTVBUS_INDINV)
                flags |= ULPI_IFC_CTRL_EXTERNAL_VBUS;
-        if (otg->flags & ULPI_IC_IND_PASSTHRU)
+        if (phy->flags & ULPI_IC_IND_PASSTHRU)
                flags |= ULPI_IFC_CTRL_PASSTHRU;
-        if (otg->flags & ULPI_IC_PROTECT_DIS)
+        if (phy->flags & ULPI_IC_PROTECT_DIS)
                flags |= ULPI_IFC_CTRL_PROTECT_IFC_DISABLE;
-        return otg_io_write(otg, flags, ULPI_IFC_CTRL);
+        return usb_phy_io_write(phy, flags, ULPI_IFC_CTRL);
 }
-static int ulpi_set_flags(struct otg_transceiver *otg)
+static int ulpi_set_flags(struct usb_phy *phy)
 {
        int ret;
-        ret = ulpi_set_otg_flags(otg);
+        ret = ulpi_set_otg_flags(phy);
        if (ret)
                return ret;
-        ret = ulpi_set_ic_flags(otg);
+        ret = ulpi_set_ic_flags(phy);
        if (ret)
                return ret;
-        return ulpi_set_fc_flags(otg);
+        return ulpi_set_fc_flags(phy);
 }
-static int ulpi_check_integrity(struct otg_transceiver *otg)
+static int ulpi_check_integrity(struct usb_phy *phy)
 {
        int ret, i;
        unsigned int val = 0x55;
        for (i = 0; i < 2; i++) {
-                ret = otg_io_write(otg, val, ULPI_SCRATCH);
+                ret = usb_phy_io_write(phy, val, ULPI_SCRATCH);
                if (ret < 0)
                        return ret;
-                ret = otg_io_read(otg, ULPI_SCRATCH);
+                ret = usb_phy_io_read(phy, ULPI_SCRATCH);
                if (ret < 0)
                        return ret;
@@ -175,13 +175,13 @@ static int ulpi_check_integrity(struct otg_transceiver *otg)
        return 0;
 }
-static int ulpi_init(struct otg_transceiver *otg)
+static int ulpi_init(struct usb_phy *phy)
 {
        int i, vid, pid, ret;
        u32 ulpi_id = 0;
        for (i = 0; i < 4; i++) {
-                ret = otg_io_read(otg, ULPI_PRODUCT_ID_HIGH - i);
+                ret = usb_phy_io_read(phy, ULPI_PRODUCT_ID_HIGH - i);
                if (ret < 0)
                        return ret;
                ulpi_id = (ulpi_id << 8) | ret;
@@ -199,16 +199,17 @@ static int ulpi_init(struct otg_transceiver *otg)
                }
        }
-        ret = ulpi_check_integrity(otg);
+        ret = ulpi_check_integrity(phy);
        if (ret)
                return ret;
-        return ulpi_set_flags(otg);
+        return ulpi_set_flags(phy);
 }
-static int ulpi_set_host(struct otg_transceiver *otg, struct usb_bus *host)
+static int ulpi_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        unsigned int flags = otg_io_read(otg, ULPI_IFC_CTRL);
+        struct usb_phy *phy = otg->phy;
+        unsigned int flags = usb_phy_io_read(phy, ULPI_IFC_CTRL);
        if (!host) {
                otg->host = NULL;
@@ -221,51 +222,62 @@ static int ulpi_set_host(struct otg_transceiver *otg, struct usb_bus *host)
                   ULPI_IFC_CTRL_3_PIN_SERIAL_MODE |
                   ULPI_IFC_CTRL_CARKITMODE);
-        if (otg->flags & ULPI_IC_6PIN_SERIAL)
+        if (phy->flags & ULPI_IC_6PIN_SERIAL)
                flags |= ULPI_IFC_CTRL_6_PIN_SERIAL_MODE;
-        else if (otg->flags & ULPI_IC_3PIN_SERIAL)
+        else if (phy->flags & ULPI_IC_3PIN_SERIAL)
                flags |= ULPI_IFC_CTRL_3_PIN_SERIAL_MODE;
-        else if (otg->flags & ULPI_IC_CARKIT)
+        else if (phy->flags & ULPI_IC_CARKIT)
                flags |= ULPI_IFC_CTRL_CARKITMODE;
-        return otg_io_write(otg, flags, ULPI_IFC_CTRL);
+        return usb_phy_io_write(phy, flags, ULPI_IFC_CTRL);
 }
-static int ulpi_set_vbus(struct otg_transceiver *otg, bool on)
+static int ulpi_set_vbus(struct usb_otg *otg, bool on)
 {
-        unsigned int flags = otg_io_read(otg, ULPI_OTG_CTRL);
+        struct usb_phy *phy = otg->phy;
+        unsigned int flags = usb_phy_io_read(phy, ULPI_OTG_CTRL);
        flags &= ~(ULPI_OTG_CTRL_DRVVBUS | ULPI_OTG_CTRL_DRVVBUS_EXT);
        if (on) {
-                if (otg->flags & ULPI_OTG_DRVVBUS)
+                if (phy->flags & ULPI_OTG_DRVVBUS)
                        flags |= ULPI_OTG_CTRL_DRVVBUS;
-                if (otg->flags & ULPI_OTG_DRVVBUS_EXT)
+                if (phy->flags & ULPI_OTG_DRVVBUS_EXT)
                        flags |= ULPI_OTG_CTRL_DRVVBUS_EXT;
        }
-        return otg_io_write(otg, flags, ULPI_OTG_CTRL);
+        return usb_phy_io_write(phy, flags, ULPI_OTG_CTRL);
 }
-struct otg_transceiver *
+struct usb_phy *
-otg_ulpi_create(struct otg_io_access_ops *ops,
+otg_ulpi_create(struct usb_phy_io_ops *ops,
                unsigned int flags)
 {
-        struct otg_transceiver *otg;
+        struct usb_phy *phy;
+        struct usb_otg *otg;
+        phy = kzalloc(sizeof(*phy), GFP_KERNEL);
+        if (!phy)
+                return NULL;
        otg = kzalloc(sizeof(*otg), GFP_KERNEL);
-        if (!otg)
+        if (!otg) {
+                kfree(phy);
                return NULL;
+        }
+        phy->label      = "ULPI";
+        phy->flags      = flags;
+        phy->io_ops     = ops;
+        phy->otg        = otg;
+        phy->init       = ulpi_init;
-        otg->label      = "ULPI";
+        otg->phy        = phy;
-        otg->flags      = flags;
-        otg->io_ops     = ops;
-        otg->init       = ulpi_init;
        otg->set_host   = ulpi_set_host;
        otg->set_vbus   = ulpi_set_vbus;
-        return otg;
+        return phy;
 }
 EXPORT_SYMBOL_GPL(otg_ulpi_create);
diff --git a/drivers/usb/otg/ulpi_viewport.c b/drivers/usb/otg/ulpi_viewport.c
index e9a37f90994..c5ba7e5423f 100644
--- a/drivers/usb/otg/ulpi_viewport.c
+++ b/drivers/usb/otg/ulpi_viewport.c
@@ -40,7 +40,7 @@ static int ulpi_viewport_wait(void __iomem *view, u32 mask)
        return -ETIMEDOUT;
 }
-static int ulpi_viewport_read(struct otg_transceiver *otg, u32 reg)
+static int ulpi_viewport_read(struct usb_phy *otg, u32 reg)
 {
        int ret;
        void __iomem *view = otg->io_priv;
@@ -58,7 +58,7 @@ static int ulpi_viewport_read(struct otg_transceiver *otg, u32 reg)
        return ULPI_VIEW_DATA_READ(readl(view));
 }
-static int ulpi_viewport_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static int ulpi_viewport_write(struct usb_phy *otg, u32 val, u32 reg)
 {
        int ret;
        void __iomem *view = otg->io_priv;
@@ -74,7 +74,7 @@ static int ulpi_viewport_write(struct otg_transceiver *otg, u32 val, u32 reg)
        return ulpi_viewport_wait(view, ULPI_VIEW_RUN);
 }
-struct otg_io_access_ops ulpi_viewport_access_ops = {
+struct usb_phy_io_ops ulpi_viewport_access_ops = {
        .read   = ulpi_viewport_read,
        .write  = ulpi_viewport_write,
 };
diff --git a/include/linux/usb/intel_mid_otg.h b/include/linux/usb/intel_mid_otg.h
index a0ccf795f36..756cf5543ff 100644
--- a/include/linux/usb/intel_mid_otg.h
+++ b/include/linux/usb/intel_mid_otg.h
@@ -104,11 +104,11 @@ struct iotg_ulpi_access_ops {
 /*
 * the Intel MID (Langwell/Penwell) otg transceiver driver needs to interact
 * with device and host drivers to implement the USB OTG related feature. More
- * function members are added based on otg_transceiver data structure for this
+ * function members are added based on usb_phy data structure for this
 * purpose.
 */
 struct intel_mid_otg_xceiv {
-        struct otg_transceiver  otg;
+        struct usb_phy          otg;
        struct otg_hsm          hsm;
        /* base address */
@@ -147,7 +147,7 @@ struct intel_mid_otg_xceiv {
 };
 static inline
-struct intel_mid_otg_xceiv *otg_to_mid_xceiv(struct otg_transceiver *otg)
+struct intel_mid_otg_xceiv *otg_to_mid_xceiv(struct usb_phy *otg)
 {
        return container_of(otg, struct intel_mid_otg_xceiv, otg);
 }
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index 00311fe9d0d..22a396c13f3 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -160,7 +160,7 @@ struct msm_otg_platform_data {
 *               detection process.
 */
 struct msm_otg {
-        struct otg_transceiver otg;
+        struct usb_phy phy;
        struct msm_otg_platform_data *pdata;
        int irq;
        struct clk *clk;
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index d87f44f5b04..f67810f8f21 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -35,7 +35,7 @@ enum usb_otg_state {
        OTG_STATE_A_VBUS_ERR,
 };
-enum usb_xceiv_events {
+enum usb_phy_events {
        USB_EVENT_NONE,         /* no events or cable disconnected */
        USB_EVENT_VBUS,         /* vbus valid event */
        USB_EVENT_ID,           /* id was grounded */
@@ -43,14 +43,39 @@ enum usb_xceiv_events {
        USB_EVENT_ENUMERATED,   /* gadget driver enumerated */
 };
-struct otg_transceiver;
+struct usb_phy;
 /* for transceivers connected thru an ULPI interface, the user must
 * provide access ops
 */
-struct otg_io_access_ops {
+struct usb_phy_io_ops {
-        int (*read)(struct otg_transceiver *otg, u32 reg);
+        int (*read)(struct usb_phy *x, u32 reg);
-        int (*write)(struct otg_transceiver *otg, u32 val, u32 reg);
+        int (*write)(struct usb_phy *x, u32 val, u32 reg);
+};
+struct usb_otg {
+        u8                      default_a;
+        struct usb_phy          *phy;
+        struct usb_bus          *host;
+        struct usb_gadget       *gadget;
+        /* bind/unbind the host controller */
+        int     (*set_host)(struct usb_otg *otg, struct usb_bus *host);
+        /* bind/unbind the peripheral controller */
+        int     (*set_peripheral)(struct usb_otg *otg,
+                                        struct usb_gadget *gadget);
+        /* effective for A-peripheral, ignored for B devices */
+        int     (*set_vbus)(struct usb_otg *otg, bool enabled);
+        /* for B devices only:  start session with A-Host */
+        int     (*start_srp)(struct usb_otg *otg);
+        /* start or continue HNP role switch */
+        int     (*start_hnp)(struct usb_otg *otg);
 };
 /*
@@ -59,22 +84,20 @@ struct otg_io_access_ops {
 * moment, using the transceiver, ID signal, HNP and sometimes static
 * configuration information (including "board isn't wired for otg").
 */
-struct otg_transceiver {
+struct usb_phy {
        struct device           *dev;
        const char              *label;
        unsigned int             flags;
-        u8                      default_a;
        enum usb_otg_state      state;
-        enum usb_xceiv_events   last_event;
+        enum usb_phy_events     last_event;
-        struct usb_bus          *host;
+        struct usb_otg          *otg;
-        struct usb_gadget       *gadget;
-        struct otg_io_access_ops        *io_ops;
+        struct usb_phy_io_ops   *io_ops;
-        void __iomem                    *io_priv;
+        void __iomem            *io_priv;
-        /* for notification of usb_xceiv_events */
+        /* for notification of usb_phy_events */
        struct atomic_notifier_head     notifier;
        /* to pass extra port status to the root hub */
@@ -82,40 +105,22 @@ struct otg_transceiver {
        u16                     port_change;
        /* initialize/shutdown the OTG controller */
-        int     (*init)(struct otg_transceiver *otg);
+        int     (*init)(struct usb_phy *x);
-        void    (*shutdown)(struct otg_transceiver *otg);
+        void    (*shutdown)(struct usb_phy *x);
-        /* bind/unbind the host controller */
-        int     (*set_host)(struct otg_transceiver *otg,
-                                struct usb_bus *host);
-        /* bind/unbind the peripheral controller */
-        int     (*set_peripheral)(struct otg_transceiver *otg,
-                                struct usb_gadget *gadget);
        /* effective for B devices, ignored for A-peripheral */
-        int     (*set_power)(struct otg_transceiver *otg,
+        int     (*set_power)(struct usb_phy *x,
                                unsigned mA);
-        /* effective for A-peripheral, ignored for B devices */
-        int     (*set_vbus)(struct otg_transceiver *otg,
-                                bool enabled);
        /* for non-OTG B devices: set transceiver into suspend mode */
-        int     (*set_suspend)(struct otg_transceiver *otg,
+        int     (*set_suspend)(struct usb_phy *x,
                                int suspend);
-        /* for B devices only:  start session with A-Host */
-        int     (*start_srp)(struct otg_transceiver *otg);
-        /* start or continue HNP role switch */
-        int     (*start_hnp)(struct otg_transceiver *otg);
 };
 /* for board-specific init logic */
-extern int otg_set_transceiver(struct otg_transceiver *);
+extern int usb_set_transceiver(struct usb_phy *);
 #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
 /* sometimes transceivers are accessed only through e.g. ULPI */
@@ -132,50 +137,50 @@ static inline void usb_nop_xceiv_unregister(void)
 #endif
 /* helpers for direct access thru low-level io interface */
-static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)
+static inline int usb_phy_io_read(struct usb_phy *x, u32 reg)
 {
-        if (otg->io_ops && otg->io_ops->read)
+        if (x->io_ops && x->io_ops->read)
-                return otg->io_ops->read(otg, reg);
+                return x->io_ops->read(x, reg);
        return -EINVAL;
 }
-static inline int otg_io_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static inline int usb_phy_io_write(struct usb_phy *x, u32 val, u32 reg)
 {
-        if (otg->io_ops && otg->io_ops->write)
+        if (x->io_ops && x->io_ops->write)
-                return otg->io_ops->write(otg, val, reg);
+                return x->io_ops->write(x, val, reg);
        return -EINVAL;
 }
 static inline int
-otg_init(struct otg_transceiver *otg)
+usb_phy_init(struct usb_phy *x)
 {
-        if (otg->init)
+        if (x->init)
-                return otg->init(otg);
+                return x->init(x);
        return 0;
 }
 static inline void
-otg_shutdown(struct otg_transceiver *otg)
+usb_phy_shutdown(struct usb_phy *x)
 {
-        if (otg->shutdown)
+        if (x->shutdown)
-                otg->shutdown(otg);
+                x->shutdown(x);
 }
 /* for usb host and peripheral controller drivers */
 #ifdef CONFIG_USB_OTG_UTILS
-extern struct otg_transceiver *otg_get_transceiver(void);
+extern struct usb_phy *usb_get_transceiver(void);
-extern void otg_put_transceiver(struct otg_transceiver *);
+extern void usb_put_transceiver(struct usb_phy *);
 extern const char *otg_state_string(enum usb_otg_state state);
 #else
-static inline struct otg_transceiver *otg_get_transceiver(void)
+static inline struct usb_phy *usb_get_transceiver(void)
 {
        return NULL;
 }
-static inline void otg_put_transceiver(struct otg_transceiver *x)
+static inline void usb_put_transceiver(struct usb_phy *x)
 {
 }
@@ -187,67 +192,84 @@ static inline const char *otg_state_string(enum usb_otg_state state)
 /* Context: can sleep */
 static inline int
-otg_start_hnp(struct otg_transceiver *otg)
+otg_start_hnp(struct usb_otg *otg)
 {
-        return otg->start_hnp(otg);
+        if (otg && otg->start_hnp)
+                return otg->start_hnp(otg);
+        return -ENOTSUPP;
 }
 /* Context: can sleep */
 static inline int
-otg_set_vbus(struct otg_transceiver *otg, bool enabled)
+otg_set_vbus(struct usb_otg *otg, bool enabled)
 {
-        return otg->set_vbus(otg, enabled);
+        if (otg && otg->set_vbus)
+                return otg->set_vbus(otg, enabled);
+        return -ENOTSUPP;
 }
 /* for HCDs */
 static inline int
-otg_set_host(struct otg_transceiver *otg, struct usb_bus *host)
+otg_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        return otg->set_host(otg, host);
+        if (otg && otg->set_host)
+                return otg->set_host(otg, host);
+        return -ENOTSUPP;
 }
 /* for usb peripheral controller drivers */
 /* Context: can sleep */
 static inline int
-otg_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *periph)
+otg_set_peripheral(struct usb_otg *otg, struct usb_gadget *periph)
 {
-        return otg->set_peripheral(otg, periph);
+        if (otg && otg->set_peripheral)
+                return otg->set_peripheral(otg, periph);
+        return -ENOTSUPP;
 }
 static inline int
-otg_set_power(struct otg_transceiver *otg, unsigned mA)
+usb_phy_set_power(struct usb_phy *x, unsigned mA)
 {
-        return otg->set_power(otg, mA);
+        if (x && x->set_power)
+                return x->set_power(x, mA);
+        return 0;
 }
 /* Context: can sleep */
 static inline int
-otg_set_suspend(struct otg_transceiver *otg, int suspend)
+usb_phy_set_suspend(struct usb_phy *x, int suspend)
 {
-        if (otg->set_suspend != NULL)
+        if (x->set_suspend != NULL)
-                return otg->set_suspend(otg, suspend);
+                return x->set_suspend(x, suspend);
        else
                return 0;
 }
 static inline int
-otg_start_srp(struct otg_transceiver *otg)
+otg_start_srp(struct usb_otg *otg)
 {
-        return otg->start_srp(otg);
+        if (otg && otg->start_srp)
+                return otg->start_srp(otg);
+        return -ENOTSUPP;
 }
 /* notifiers */
 static inline int
-otg_register_notifier(struct otg_transceiver *otg, struct notifier_block *nb)
+usb_register_notifier(struct usb_phy *x, struct notifier_block *nb)
 {
-        return atomic_notifier_chain_register(&otg->notifier, nb);
+        return atomic_notifier_chain_register(&x->notifier, nb);
 }
 static inline void
-otg_unregister_notifier(struct otg_transceiver *otg, struct notifier_block *nb)
+usb_unregister_notifier(struct usb_phy *x, struct notifier_block *nb)
 {
-        atomic_notifier_chain_unregister(&otg->notifier, nb);
+        atomic_notifier_chain_unregister(&x->notifier, nb);
 }
 /* for OTG controller drivers (and maybe other stuff) */
diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h
index 9595796d62e..6f033a415ec 100644
--- a/include/linux/usb/ulpi.h
+++ b/include/linux/usb/ulpi.h
@@ -181,12 +181,12 @@
 /*-------------------------------------------------------------------------*/
-struct otg_transceiver *otg_ulpi_create(struct otg_io_access_ops *ops,
+struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,
                                        unsigned int flags);
 #ifdef CONFIG_USB_ULPI_VIEWPORT
 /* access ops for controllers with a viewport register */
-extern struct otg_io_access_ops ulpi_viewport_access_ops;
+extern struct usb_phy_io_ops ulpi_viewport_access_ops;
 #endif
 #endif /* __LINUX_USB_ULPI_H */