aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-imx/mx31moboard-devboard.c6
-rw-r--r--arch/arm/mach-imx/mx31moboard-marxbot.c6
-rw-r--r--arch/arm/mach-pxa/pxa3xx-ulpi.c6
-rw-r--r--arch/arm/mach-tegra/include/mach/usb_phy.h2
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc_ehci.h2
-rw-r--r--arch/arm/plat-mxc/include/mach/ulpi.h4
-rw-r--r--arch/arm/plat-mxc/ulpi.c6
-rw-r--r--drivers/power/isp1704_charger.c2
-rw-r--r--drivers/power/pda_power.c2
-rw-r--r--drivers/power/twl4030_charger.c2
-rw-r--r--drivers/usb/gadget/ci13xxx_udc.h2
-rw-r--r--drivers/usb/gadget/fsl_usb2_udc.h2
-rw-r--r--drivers/usb/gadget/langwell_udc.h2
-rw-r--r--drivers/usb/gadget/mv_udc.h2
-rw-r--r--drivers/usb/gadget/omap_udc.c4
-rw-r--r--drivers/usb/gadget/omap_udc.h2
-rw-r--r--drivers/usb/gadget/pxa25x_udc.h2
-rw-r--r--drivers/usb/gadget/pxa27x_udc.h2
-rw-r--r--drivers/usb/gadget/s3c-hsudc.c2
-rw-r--r--drivers/usb/host/ehci-msm.c2
-rw-r--r--drivers/usb/host/ehci-mv.c2
-rw-r--r--drivers/usb/host/ehci-tegra.c2
-rw-r--r--drivers/usb/host/ehci.h2
-rw-r--r--drivers/usb/host/ohci.h2
-rw-r--r--drivers/usb/musb/blackfin.c2
-rw-r--r--drivers/usb/musb/musb_core.c4
-rw-r--r--drivers/usb/musb/musb_core.h2
-rw-r--r--drivers/usb/musb/tusb6010.c2
-rw-r--r--drivers/usb/otg/Kconfig2
-rw-r--r--drivers/usb/otg/ab8500-usb.c12
-rw-r--r--drivers/usb/otg/fsl_otg.c18
-rw-r--r--drivers/usb/otg/fsl_otg.h2
-rw-r--r--drivers/usb/otg/gpio_vbus.c8
-rw-r--r--drivers/usb/otg/isp1301_omap.c12
-rw-r--r--drivers/usb/otg/msm_otg.c54
-rw-r--r--drivers/usb/otg/mv_otg.c14
-rw-r--r--drivers/usb/otg/mv_otg.h2
-rw-r--r--drivers/usb/otg/nop-usb-xceiv.c10
-rw-r--r--drivers/usb/otg/otg.c8
-rw-r--r--drivers/usb/otg/otg_fsm.h2
-rw-r--r--drivers/usb/otg/twl4030-usb.c8
-rw-r--r--drivers/usb/otg/twl6030-usb.c18
-rw-r--r--drivers/usb/otg/ulpi.c20
-rw-r--r--drivers/usb/otg/ulpi_viewport.c4
-rw-r--r--include/linux/usb/intel_mid_otg.h6
-rw-r--r--include/linux/usb/msm_hsusb.h2
-rw-r--r--include/linux/usb/otg.h98
-rw-r--r--include/linux/usb/ulpi.h2
48 files changed, 190 insertions, 190 deletions
diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c
index 0aa25364360..9cd4a97efa5 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)
158#define USBH1_VBUSEN_B IOMUX_TO_GPIO(MX31_PIN_NFRE_B) 158#define USBH1_VBUSEN_B IOMUX_TO_GPIO(MX31_PIN_NFRE_B)
159#define USBH1_MODE IOMUX_TO_GPIO(MX31_PIN_NFALE) 159#define USBH1_MODE IOMUX_TO_GPIO(MX31_PIN_NFALE)
160 160
161static int devboard_isp1105_init(struct otg_transceiver *otg) 161static int devboard_isp1105_init(struct usb_phy *otg)
162{ 162{
163 int ret = gpio_request(USBH1_MODE, "usbh1-mode"); 163 int ret = gpio_request(USBH1_MODE, "usbh1-mode");
164 if (ret) 164 if (ret)
@@ -177,7 +177,7 @@ static int devboard_isp1105_init(struct otg_transceiver *otg)
177} 177}
178 178
179 179
180static int devboard_isp1105_set_vbus(struct otg_transceiver *otg, bool on) 180static int devboard_isp1105_set_vbus(struct usb_phy *otg, bool on)
181{ 181{
182 if (on) 182 if (on)
183 gpio_set_value(USBH1_VBUSEN_B, 0); 183 gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -194,7 +194,7 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = {
194 194
195static int __init devboard_usbh1_init(void) 195static int __init devboard_usbh1_init(void)
196{ 196{
197 struct otg_transceiver *otg; 197 struct usb_phy *otg;
198 struct platform_device *pdev; 198 struct platform_device *pdev;
199 199
200 otg = kzalloc(sizeof(*otg), GFP_KERNEL); 200 otg = kzalloc(sizeof(*otg), GFP_KERNEL);
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index bb639cbda4e..2be769bbe05 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)
272#define USBH1_VBUSEN_B IOMUX_TO_GPIO(MX31_PIN_NFRE_B) 272#define USBH1_VBUSEN_B IOMUX_TO_GPIO(MX31_PIN_NFRE_B)
273#define USBH1_MODE IOMUX_TO_GPIO(MX31_PIN_NFALE) 273#define USBH1_MODE IOMUX_TO_GPIO(MX31_PIN_NFALE)
274 274
275static int marxbot_isp1105_init(struct otg_transceiver *otg) 275static int marxbot_isp1105_init(struct usb_phy *otg)
276{ 276{
277 int ret = gpio_request(USBH1_MODE, "usbh1-mode"); 277 int ret = gpio_request(USBH1_MODE, "usbh1-mode");
278 if (ret) 278 if (ret)
@@ -291,7 +291,7 @@ static int marxbot_isp1105_init(struct otg_transceiver *otg)
291} 291}
292 292
293 293
294static int marxbot_isp1105_set_vbus(struct otg_transceiver *otg, bool on) 294static int marxbot_isp1105_set_vbus(struct usb_phy *otg, bool on)
295{ 295{
296 if (on) 296 if (on)
297 gpio_set_value(USBH1_VBUSEN_B, 0); 297 gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -308,7 +308,7 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = {
308 308
309static int __init marxbot_usbh1_init(void) 309static int __init marxbot_usbh1_init(void)
310{ 310{
311 struct otg_transceiver *otg; 311 struct usb_phy *otg;
312 struct platform_device *pdev; 312 struct platform_device *pdev;
313 313
314 otg = kzalloc(sizeof(*otg), GFP_KERNEL); 314 otg = kzalloc(sizeof(*otg), GFP_KERNEL);
diff --git a/arch/arm/mach-pxa/pxa3xx-ulpi.c b/arch/arm/mach-pxa/pxa3xx-ulpi.c
index e28dfb88827..960d0ac5041 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 {
33 struct clk *clk; 33 struct clk *clk;
34 void __iomem *mmio_base; 34 void __iomem *mmio_base;
35 35
36 struct otg_transceiver *otg; 36 struct usb_phy *otg;
37 unsigned int ulpi_mode; 37 unsigned int ulpi_mode;
38}; 38};
39 39
@@ -79,7 +79,7 @@ static int pxa310_ulpi_poll(void)
79 return -ETIMEDOUT; 79 return -ETIMEDOUT;
80} 80}
81 81
82static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg) 82static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
83{ 83{
84 int err; 84 int err;
85 85
@@ -98,7 +98,7 @@ static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg)
98 return u2d_readl(U2DOTGUCR) & U2DOTGUCR_RDATA; 98 return u2d_readl(U2DOTGUCR) & U2DOTGUCR_RDATA;
99} 99}
100 100
101static int pxa310_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg) 101static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
102{ 102{
103 if (pxa310_ulpi_get_phymode() != SYNCH) { 103 if (pxa310_ulpi_get_phymode() != SYNCH) {
104 pr_warning("%s: PHY is not in SYNCH mode!\n", __func__); 104 pr_warning("%s: PHY is not in SYNCH mode!\n", __func__);
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 {
58 struct clk *pad_clk; 58 struct clk *pad_clk;
59 enum tegra_usb_phy_mode mode; 59 enum tegra_usb_phy_mode mode;
60 void *config; 60 void *config;
61 struct otg_transceiver *ulpi; 61 struct usb_phy *ulpi;
62}; 62};
63 63
64struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs, 64struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,
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 {
44 int (*exit)(struct platform_device *pdev); 44 int (*exit)(struct platform_device *pdev);
45 45
46 unsigned int portsc; 46 unsigned int portsc;
47 struct otg_transceiver *otg; 47 struct usb_phy *otg;
48}; 48};
49 49
50int mx51_initialize_usb_hw(int port, unsigned int flags); 50int 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..d39d94a170e 100644
--- a/arch/arm/plat-mxc/include/mach/ulpi.h
+++ b/arch/arm/plat-mxc/include/mach/ulpi.h
@@ -2,9 +2,9 @@
2#define __MACH_ULPI_H 2#define __MACH_ULPI_H
3 3
4#ifdef CONFIG_USB_ULPI 4#ifdef CONFIG_USB_ULPI
5struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags); 5struct usb_phy *imx_otg_ulpi_create(unsigned int flags);
6#else 6#else
7static inline struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags) 7static inline struct usb_phy *imx_otg_ulpi_create(unsigned int flags)
8{ 8{
9 return NULL; 9 return NULL;
10} 10}
diff --git a/arch/arm/plat-mxc/ulpi.c b/arch/arm/plat-mxc/ulpi.c
index 477e45bea1b..8eeeb6b979c 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)
58 return -ETIMEDOUT; 58 return -ETIMEDOUT;
59} 59}
60 60
61static int ulpi_read(struct otg_transceiver *otg, u32 reg) 61static int ulpi_read(struct usb_phy *otg, u32 reg)
62{ 62{
63 int ret; 63 int ret;
64 void __iomem *view = otg->io_priv; 64 void __iomem *view = otg->io_priv;
@@ -84,7 +84,7 @@ static int ulpi_read(struct otg_transceiver *otg, u32 reg)
84 return (__raw_readl(view) >> ULPIVW_RDATA_SHIFT) & ULPIVW_RDATA_MASK; 84 return (__raw_readl(view) >> ULPIVW_RDATA_SHIFT) & ULPIVW_RDATA_MASK;
85} 85}
86 86
87static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg) 87static int ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
88{ 88{
89 int ret; 89 int ret;
90 void __iomem *view = otg->io_priv; 90 void __iomem *view = otg->io_priv;
@@ -112,7 +112,7 @@ struct otg_io_access_ops mxc_ulpi_access_ops = {
112}; 112};
113EXPORT_SYMBOL_GPL(mxc_ulpi_access_ops); 113EXPORT_SYMBOL_GPL(mxc_ulpi_access_ops);
114 114
115struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags) 115struct usb_phy *imx_otg_ulpi_create(unsigned int flags)
116{ 116{
117 return otg_ulpi_create(&mxc_ulpi_access_ops, flags); 117 return otg_ulpi_create(&mxc_ulpi_access_ops, flags);
118} 118}
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index b806667b59a..51cdea4fc03 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -56,7 +56,7 @@ static u16 isp170x_id[] = {
56struct isp1704_charger { 56struct isp1704_charger {
57 struct device *dev; 57 struct device *dev;
58 struct power_supply psy; 58 struct power_supply psy;
59 struct otg_transceiver *otg; 59 struct usb_phy *otg;
60 struct notifier_block nb; 60 struct notifier_block nb;
61 struct work_struct work; 61 struct work_struct work;
62 62
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index fd49689738a..dcf07f55eb0 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -40,7 +40,7 @@ static struct timer_list polling_timer;
40static int polling; 40static int polling;
41 41
42#ifdef CONFIG_USB_OTG_UTILS 42#ifdef CONFIG_USB_OTG_UTILS
43static struct otg_transceiver *transceiver; 43static struct usb_phy *transceiver;
44static struct notifier_block otg_nb; 44static struct notifier_block otg_nb;
45#endif 45#endif
46 46
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 54b9198fa57..b3ead2305b4 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -69,7 +69,7 @@ struct twl4030_bci {
69 struct device *dev; 69 struct device *dev;
70 struct power_supply ac; 70 struct power_supply ac;
71 struct power_supply usb; 71 struct power_supply usb;
72 struct otg_transceiver *transceiver; 72 struct usb_phy *transceiver;
73 struct notifier_block otg_nb; 73 struct notifier_block otg_nb;
74 struct work_struct work; 74 struct work_struct work;
75 int irq_chg; 75 int irq_chg;
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 {
136 struct usb_gadget_driver *driver; /* 3rd party gadget driver */ 136 struct usb_gadget_driver *driver; /* 3rd party gadget driver */
137 struct ci13xxx_udc_driver *udc_driver; /* device controller driver */ 137 struct ci13xxx_udc_driver *udc_driver; /* device controller driver */
138 int vbus_active; /* is VBUS active */ 138 int vbus_active; /* is VBUS active */
139 struct otg_transceiver *transceiver; /* Transceiver struct */ 139 struct usb_phy *transceiver; /* Transceiver struct */
140}; 140};
141 141
142/****************************************************************************** 142/******************************************************************************
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 {
471 471
472 struct usb_ctrlrequest local_setup_buff; 472 struct usb_ctrlrequest local_setup_buff;
473 spinlock_t lock; 473 spinlock_t lock;
474 struct otg_transceiver *transceiver; 474 struct usb_phy *transceiver;
475 unsigned softconnect:1; 475 unsigned softconnect:1;
476 unsigned vbus_active:1; 476 unsigned vbus_active:1;
477 unsigned stopped:1; 477 unsigned stopped:1;
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 {
162 spinlock_t lock; /* device lock */ 162 spinlock_t lock; /* device lock */
163 struct langwell_ep *ep; 163 struct langwell_ep *ep;
164 struct usb_gadget_driver *driver; 164 struct usb_gadget_driver *driver;
165 struct otg_transceiver *transceiver; 165 struct usb_phy *transceiver;
166 u8 dev_addr; 166 u8 dev_addr;
167 u32 usb_state; 167 u32 usb_state;
168 u32 resume_state; 168 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 {
217 struct work_struct vbus_work; 217 struct work_struct vbus_work;
218 struct workqueue_struct *qwork; 218 struct workqueue_struct *qwork;
219 219
220 struct otg_transceiver *transceiver; 220 struct usb_phy *transceiver;
221 221
222 struct mv_usb_platform_data *pdata; 222 struct mv_usb_platform_data *pdata;
223 223
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 576cd8578b4..d3529787351 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2650,7 +2650,7 @@ static void omap_udc_release(struct device *dev)
2650} 2650}
2651 2651
2652static int __init 2652static int __init
2653omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv) 2653omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
2654{ 2654{
2655 unsigned tmp, buf; 2655 unsigned tmp, buf;
2656 2656
@@ -2790,7 +2790,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
2790{ 2790{
2791 int status = -ENODEV; 2791 int status = -ENODEV;
2792 int hmc; 2792 int hmc;
2793 struct otg_transceiver *xceiv = NULL; 2793 struct usb_phy *xceiv = NULL;
2794 const char *type = NULL; 2794 const char *type = NULL;
2795 struct omap_usb_config *config = pdev->dev.platform_data; 2795 struct omap_usb_config *config = pdev->dev.platform_data;
2796 struct clk *dc_clk; 2796 struct clk *dc_clk;
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 {
164 struct omap_ep ep[32]; 164 struct omap_ep ep[32];
165 u16 devstat; 165 u16 devstat;
166 u16 clr_halt; 166 u16 clr_halt;
167 struct otg_transceiver *transceiver; 167 struct usb_phy *transceiver;
168 struct list_head iso; 168 struct list_head iso;
169 unsigned softconnect:1; 169 unsigned softconnect:1;
170 unsigned vbus_active:1; 170 unsigned vbus_active:1;
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 {
119 struct device *dev; 119 struct device *dev;
120 struct clk *clk; 120 struct clk *clk;
121 struct pxa2xx_udc_mach_info *mach; 121 struct pxa2xx_udc_mach_info *mach;
122 struct otg_transceiver *transceiver; 122 struct usb_phy *transceiver;
123 u64 dma_mask; 123 u64 dma_mask;
124 struct pxa25x_ep ep [PXA_UDC_NUM_ENDPOINTS]; 124 struct pxa25x_ep ep [PXA_UDC_NUM_ENDPOINTS];
125 125
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 {
447 struct usb_gadget_driver *driver; 447 struct usb_gadget_driver *driver;
448 struct device *dev; 448 struct device *dev;
449 struct pxa2xx_udc_mach_info *mach; 449 struct pxa2xx_udc_mach_info *mach;
450 struct otg_transceiver *transceiver; 450 struct usb_phy *transceiver;
451 451
452 enum ep0_state ep0state; 452 enum ep0_state ep0state;
453 struct udc_stats stats; 453 struct udc_stats stats;
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index df8661d266c..dea475a61fd 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -145,7 +145,7 @@ struct s3c_hsudc {
145 struct usb_gadget_driver *driver; 145 struct usb_gadget_driver *driver;
146 struct device *dev; 146 struct device *dev;
147 struct s3c24xx_hsudc_platdata *pd; 147 struct s3c24xx_hsudc_platdata *pd;
148 struct otg_transceiver *transceiver; 148 struct usb_phy *transceiver;
149 struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsudc_supply_names)]; 149 struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsudc_supply_names)];
150 spinlock_t lock; 150 spinlock_t lock;
151 void __iomem *regs; 151 void __iomem *regs;
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 592d5f76803..ef7c4319c6e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -32,7 +32,7 @@
32 32
33#define MSM_USB_BASE (hcd->regs) 33#define MSM_USB_BASE (hcd->regs)
34 34
35static struct otg_transceiver *otg; 35static struct usb_phy *otg;
36 36
37static int ehci_msm_reset(struct usb_hcd *hcd) 37static int ehci_msm_reset(struct usb_hcd *hcd)
38{ 38{
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 52a604fb932..39ca79e008d 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -28,7 +28,7 @@ struct ehci_hcd_mv {
28 void __iomem *cap_regs; 28 void __iomem *cap_regs;
29 void __iomem *op_regs; 29 void __iomem *op_regs;
30 30
31 struct otg_transceiver *otg; 31 struct usb_phy *otg;
32 32
33 struct mv_usb_platform_data *pdata; 33 struct mv_usb_platform_data *pdata;
34 34
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index dbc7fe8ca9e..2e157144dcf 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -35,7 +35,7 @@ struct tegra_ehci_hcd {
35 struct tegra_usb_phy *phy; 35 struct tegra_usb_phy *phy;
36 struct clk *clk; 36 struct clk *clk;
37 struct clk *emc_clk; 37 struct clk *emc_clk;
38 struct otg_transceiver *transceiver; 38 struct usb_phy *transceiver;
39 int host_resumed; 39 int host_resumed;
40 int bus_suspended; 40 int bus_suspended;
41 int port_resuming; 41 int port_resuming;
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 */
176 /* 176 /*
177 * OTG controllers and transceivers need software interaction 177 * OTG controllers and transceivers need software interaction
178 */ 178 */
179 struct otg_transceiver *transceiver; 179 struct usb_phy *transceiver;
180}; 180};
181 181
182/* convert between an HCD pointer and the corresponding EHCI_HCD */ 182/* convert between an HCD pointer and the corresponding EHCI_HCD */
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 {
376 * OTG controllers and transceivers need software interaction; 376 * OTG controllers and transceivers need software interaction;
377 * other external transceivers should be software-transparent 377 * other external transceivers should be software-transparent
378 */ 378 */
379 struct otg_transceiver *transceiver; 379 struct usb_phy *transceiver;
380 void (*start_hnp)(struct ohci_hcd *ohci); 380 void (*start_hnp)(struct ohci_hcd *ohci);
381 381
382 /* 382 /*
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 5e7cfba5b07..fc8e9edbcb8 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)
317 musb_readb(musb->mregs, MUSB_DEVCTL)); 317 musb_readb(musb->mregs, MUSB_DEVCTL));
318} 318}
319 319
320static int bfin_musb_set_power(struct otg_transceiver *x, unsigned mA) 320static int bfin_musb_set_power(struct usb_phy *x, unsigned mA)
321{ 321{
322 return 0; 322 return 0;
323} 323}
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3d11cf64ebd..7b7ecf6c65b 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -131,7 +131,7 @@ static inline struct musb *dev_to_musb(struct device *dev)
131/*-------------------------------------------------------------------------*/ 131/*-------------------------------------------------------------------------*/
132 132
133#ifndef CONFIG_BLACKFIN 133#ifndef CONFIG_BLACKFIN
134static int musb_ulpi_read(struct otg_transceiver *otg, u32 offset) 134static int musb_ulpi_read(struct usb_phy *otg, u32 offset)
135{ 135{
136 void __iomem *addr = otg->io_priv; 136 void __iomem *addr = otg->io_priv;
137 int i = 0; 137 int i = 0;
@@ -165,7 +165,7 @@ static int musb_ulpi_read(struct otg_transceiver *otg, u32 offset)
165 return musb_readb(addr, MUSB_ULPI_REG_DATA); 165 return musb_readb(addr, MUSB_ULPI_REG_DATA);
166} 166}
167 167
168static int musb_ulpi_write(struct otg_transceiver *otg, 168static int musb_ulpi_write(struct usb_phy *otg,
169 u32 offset, u32 data) 169 u32 offset, u32 data)
170{ 170{
171 void __iomem *addr = otg->io_priv; 171 void __iomem *addr = otg->io_priv;
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 {
372 u16 int_rx; 372 u16 int_rx;
373 u16 int_tx; 373 u16 int_tx;
374 374
375 struct otg_transceiver *xceiv; 375 struct usb_phy *xceiv;
376 u8 xceiv_event; 376 u8 xceiv_event;
377 377
378 int nIrq; 378 int nIrq;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 1f405616e6c..5ce01bdb195 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -277,7 +277,7 @@ static struct musb *the_musb;
277 * mode), or low power Default-B sessions, something else supplies power. 277 * mode), or low power Default-B sessions, something else supplies power.
278 * Caller must take care of locking. 278 * Caller must take care of locking.
279 */ 279 */
280static int tusb_draw_power(struct otg_transceiver *x, unsigned mA) 280static int tusb_draw_power(struct usb_phy *x, unsigned mA)
281{ 281{
282 struct musb *musb = the_musb; 282 struct musb *musb = the_musb;
283 void __iomem *tbase = musb->ctrl_base; 283 void __iomem *tbase = musb->ctrl_base;
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 76d62934541..b353b393448 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -23,7 +23,7 @@ config USB_GPIO_VBUS
23 select USB_OTG_UTILS 23 select USB_OTG_UTILS
24 help 24 help
25 Provides simple GPIO VBUS sensing for controllers with an 25 Provides simple GPIO VBUS sensing for controllers with an
26 internal transceiver via the otg_transceiver interface, and 26 internal transceiver via the usb_phy interface, and
27 optionally control of a D+ pullup GPIO as well as a VBUS 27 optionally control of a D+ pullup GPIO as well as a VBUS
28 current limit regulator. 28 current limit regulator.
29 29
diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c
index 74fe6e62e0f..5f06dda7db6 100644
--- a/drivers/usb/otg/ab8500-usb.c
+++ b/drivers/usb/otg/ab8500-usb.c
@@ -68,7 +68,7 @@ enum ab8500_usb_link_status {
68}; 68};
69 69
70struct ab8500_usb { 70struct ab8500_usb {
71 struct otg_transceiver otg; 71 struct usb_phy otg;
72 struct device *dev; 72 struct device *dev;
73 int irq_num_id_rise; 73 int irq_num_id_rise;
74 int irq_num_id_fall; 74 int irq_num_id_fall;
@@ -82,7 +82,7 @@ struct ab8500_usb {
82 int rev; 82 int rev;
83}; 83};
84 84
85static inline struct ab8500_usb *xceiv_to_ab(struct otg_transceiver *x) 85static inline struct ab8500_usb *xceiv_to_ab(struct usb_phy *x)
86{ 86{
87 return container_of(x, struct ab8500_usb, otg); 87 return container_of(x, struct ab8500_usb, otg);
88} 88}
@@ -269,7 +269,7 @@ static void ab8500_usb_phy_disable_work(struct work_struct *work)
269 ab8500_usb_peri_phy_dis(ab); 269 ab8500_usb_peri_phy_dis(ab);
270} 270}
271 271
272static int ab8500_usb_set_power(struct otg_transceiver *otg, unsigned mA) 272static int ab8500_usb_set_power(struct usb_phy *otg, unsigned mA)
273{ 273{
274 struct ab8500_usb *ab; 274 struct ab8500_usb *ab;
275 275
@@ -290,13 +290,13 @@ static int ab8500_usb_set_power(struct otg_transceiver *otg, unsigned mA)
290 * ab->vbus_draw. 290 * ab->vbus_draw.
291 */ 291 */
292 292
293static int ab8500_usb_set_suspend(struct otg_transceiver *x, int suspend) 293static int ab8500_usb_set_suspend(struct usb_phy *x, int suspend)
294{ 294{
295 /* TODO */ 295 /* TODO */
296 return 0; 296 return 0;
297} 297}
298 298
299static int ab8500_usb_set_peripheral(struct otg_transceiver *otg, 299static int ab8500_usb_set_peripheral(struct usb_phy *otg,
300 struct usb_gadget *gadget) 300 struct usb_gadget *gadget)
301{ 301{
302 struct ab8500_usb *ab; 302 struct ab8500_usb *ab;
@@ -329,7 +329,7 @@ static int ab8500_usb_set_peripheral(struct otg_transceiver *otg,
329 return 0; 329 return 0;
330} 330}
331 331
332static int ab8500_usb_set_host(struct otg_transceiver *otg, 332static int ab8500_usb_set_host(struct usb_phy *otg,
333 struct usb_bus *host) 333 struct usb_bus *host)
334{ 334{
335 struct ab8500_usb *ab; 335 struct ab8500_usb *ab;
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index a190850d2d3..66db2a11744 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -452,7 +452,7 @@ void otg_reset_controller(void)
452/* Call suspend/resume routines in host driver */ 452/* Call suspend/resume routines in host driver */
453int fsl_otg_start_host(struct otg_fsm *fsm, int on) 453int fsl_otg_start_host(struct otg_fsm *fsm, int on)
454{ 454{
455 struct otg_transceiver *xceiv = fsm->transceiver; 455 struct usb_phy *xceiv = fsm->transceiver;
456 struct device *dev; 456 struct device *dev;
457 struct fsl_otg *otg_dev = container_of(xceiv, struct fsl_otg, otg); 457 struct fsl_otg *otg_dev = container_of(xceiv, struct fsl_otg, otg);
458 u32 retval = 0; 458 u32 retval = 0;
@@ -518,7 +518,7 @@ end:
518 */ 518 */
519int fsl_otg_start_gadget(struct otg_fsm *fsm, int on) 519int fsl_otg_start_gadget(struct otg_fsm *fsm, int on)
520{ 520{
521 struct otg_transceiver *xceiv = fsm->transceiver; 521 struct usb_phy *xceiv = fsm->transceiver;
522 struct device *dev; 522 struct device *dev;
523 523
524 if (!xceiv->gadget || !xceiv->gadget->dev.parent) 524 if (!xceiv->gadget || !xceiv->gadget->dev.parent)
@@ -542,7 +542,7 @@ int fsl_otg_start_gadget(struct otg_fsm *fsm, int on)
542 * Called by initialization code of host driver. Register host controller 542 * Called by initialization code of host driver. Register host controller
543 * to the OTG. Suspend host for OTG role detection. 543 * to the OTG. Suspend host for OTG role detection.
544 */ 544 */
545static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host) 545static int fsl_otg_set_host(struct usb_phy *otg_p, struct usb_bus *host)
546{ 546{
547 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg); 547 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
548 548
@@ -587,7 +587,7 @@ static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
587} 587}
588 588
589/* Called by initialization code of udc. Register udc to OTG. */ 589/* Called by initialization code of udc. Register udc to OTG. */
590static int fsl_otg_set_peripheral(struct otg_transceiver *otg_p, 590static int fsl_otg_set_peripheral(struct usb_phy *otg_p,
591 struct usb_gadget *gadget) 591 struct usb_gadget *gadget)
592{ 592{
593 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg); 593 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
@@ -625,7 +625,7 @@ static int fsl_otg_set_peripheral(struct otg_transceiver *otg_p,
625} 625}
626 626
627/* Set OTG port power, only for B-device */ 627/* Set OTG port power, only for B-device */
628static int fsl_otg_set_power(struct otg_transceiver *otg_p, unsigned mA) 628static int fsl_otg_set_power(struct usb_phy *otg_p, unsigned mA)
629{ 629{
630 if (!fsl_otg_dev) 630 if (!fsl_otg_dev)
631 return -ENODEV; 631 return -ENODEV;
@@ -658,7 +658,7 @@ static void fsl_otg_event(struct work_struct *work)
658} 658}
659 659
660/* B-device start SRP */ 660/* B-device start SRP */
661static int fsl_otg_start_srp(struct otg_transceiver *otg_p) 661static int fsl_otg_start_srp(struct usb_phy *otg_p)
662{ 662{
663 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg); 663 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
664 664
@@ -673,7 +673,7 @@ static int fsl_otg_start_srp(struct otg_transceiver *otg_p)
673} 673}
674 674
675/* A_host suspend will call this function to start hnp */ 675/* A_host suspend will call this function to start hnp */
676static int fsl_otg_start_hnp(struct otg_transceiver *otg_p) 676static int fsl_otg_start_hnp(struct usb_phy *otg_p)
677{ 677{
678 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg); 678 struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
679 679
@@ -698,7 +698,7 @@ static int fsl_otg_start_hnp(struct otg_transceiver *otg_p)
698irqreturn_t fsl_otg_isr(int irq, void *dev_id) 698irqreturn_t fsl_otg_isr(int irq, void *dev_id)
699{ 699{
700 struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm; 700 struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm;
701 struct otg_transceiver *otg = &((struct fsl_otg *)dev_id)->otg; 701 struct usb_phy *otg = &((struct fsl_otg *)dev_id)->otg;
702 u32 otg_int_src, otg_sc; 702 u32 otg_int_src, otg_sc;
703 703
704 otg_sc = fsl_readl(&usb_dr_regs->otgsc); 704 otg_sc = fsl_readl(&usb_dr_regs->otgsc);
@@ -815,7 +815,7 @@ err:
815int usb_otg_start(struct platform_device *pdev) 815int usb_otg_start(struct platform_device *pdev)
816{ 816{
817 struct fsl_otg *p_otg; 817 struct fsl_otg *p_otg;
818 struct otg_transceiver *otg_trans = otg_get_transceiver(); 818 struct usb_phy *otg_trans = otg_get_transceiver();
819 struct otg_fsm *fsm; 819 struct otg_fsm *fsm;
820 int status; 820 int status;
821 struct resource *res; 821 struct resource *res;
diff --git a/drivers/usb/otg/fsl_otg.h b/drivers/usb/otg/fsl_otg.h
index 3f8ef731aac..caec254ad81 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
369} 369}
370 370
371struct fsl_otg { 371struct fsl_otg {
372 struct otg_transceiver otg; 372 struct usb_phy otg;
373 struct otg_fsm fsm; 373 struct otg_fsm fsm;
374 struct usb_dr_mmap *dr_mem_map; 374 struct usb_dr_mmap *dr_mem_map;
375 struct delayed_work otg_event; 375 struct delayed_work otg_event;
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index fb644c107de..4e1b1384dc8 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -32,7 +32,7 @@
32 * Needs to be loaded before the UDC driver that will use it. 32 * Needs to be loaded before the UDC driver that will use it.
33 */ 33 */
34struct gpio_vbus_data { 34struct gpio_vbus_data {
35 struct otg_transceiver otg; 35 struct usb_phy otg;
36 struct device *dev; 36 struct device *dev;
37 struct regulator *vbus_draw; 37 struct regulator *vbus_draw;
38 int vbus_draw_enabled; 38 int vbus_draw_enabled;
@@ -149,7 +149,7 @@ static irqreturn_t gpio_vbus_irq(int irq, void *data)
149/* OTG transceiver interface */ 149/* OTG transceiver interface */
150 150
151/* bind/unbind the peripheral controller */ 151/* bind/unbind the peripheral controller */
152static int gpio_vbus_set_peripheral(struct otg_transceiver *otg, 152static int gpio_vbus_set_peripheral(struct usb_phy *otg,
153 struct usb_gadget *gadget) 153 struct usb_gadget *gadget)
154{ 154{
155 struct gpio_vbus_data *gpio_vbus; 155 struct gpio_vbus_data *gpio_vbus;
@@ -189,7 +189,7 @@ static int gpio_vbus_set_peripheral(struct otg_transceiver *otg,
189} 189}
190 190
191/* effective for B devices, ignored for A-peripheral */ 191/* effective for B devices, ignored for A-peripheral */
192static int gpio_vbus_set_power(struct otg_transceiver *otg, unsigned mA) 192static int gpio_vbus_set_power(struct usb_phy *otg, unsigned mA)
193{ 193{
194 struct gpio_vbus_data *gpio_vbus; 194 struct gpio_vbus_data *gpio_vbus;
195 195
@@ -201,7 +201,7 @@ static int gpio_vbus_set_power(struct otg_transceiver *otg, unsigned mA)
201} 201}
202 202
203/* for non-OTG B devices: set/clear transceiver suspend mode */ 203/* for non-OTG B devices: set/clear transceiver suspend mode */
204static int gpio_vbus_set_suspend(struct otg_transceiver *otg, int suspend) 204static int gpio_vbus_set_suspend(struct usb_phy *otg, int suspend)
205{ 205{
206 struct gpio_vbus_data *gpio_vbus; 206 struct gpio_vbus_data *gpio_vbus;
207 207
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 8c86787c2f0..1bc27948ac2 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");
52MODULE_LICENSE("GPL"); 52MODULE_LICENSE("GPL");
53 53
54struct isp1301 { 54struct isp1301 {
55 struct otg_transceiver otg; 55 struct usb_phy otg;
56 struct i2c_client *client; 56 struct i2c_client *client;
57 void (*i2c_release)(struct device *dev); 57 void (*i2c_release)(struct device *dev);
58 58
@@ -1274,7 +1274,7 @@ static int isp1301_otg_enable(struct isp1301 *isp)
1274 1274
1275/* add or disable the host device+driver */ 1275/* add or disable the host device+driver */
1276static int 1276static int
1277isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host) 1277isp1301_set_host(struct usb_phy *otg, struct usb_bus *host)
1278{ 1278{
1279 struct isp1301 *isp = container_of(otg, struct isp1301, otg); 1279 struct isp1301 *isp = container_of(otg, struct isp1301, otg);
1280 1280
@@ -1330,7 +1330,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
1330} 1330}
1331 1331
1332static int 1332static int
1333isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget) 1333isp1301_set_peripheral(struct usb_phy *otg, struct usb_gadget *gadget)
1334{ 1334{
1335 struct isp1301 *isp = container_of(otg, struct isp1301, otg); 1335 struct isp1301 *isp = container_of(otg, struct isp1301, otg);
1336#ifndef CONFIG_USB_OTG 1336#ifndef CONFIG_USB_OTG
@@ -1399,7 +1399,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
1399/*-------------------------------------------------------------------------*/ 1399/*-------------------------------------------------------------------------*/
1400 1400
1401static int 1401static int
1402isp1301_set_power(struct otg_transceiver *dev, unsigned mA) 1402isp1301_set_power(struct usb_phy *dev, unsigned mA)
1403{ 1403{
1404 if (!the_transceiver) 1404 if (!the_transceiver)
1405 return -ENODEV; 1405 return -ENODEV;
@@ -1409,7 +1409,7 @@ isp1301_set_power(struct otg_transceiver *dev, unsigned mA)
1409} 1409}
1410 1410
1411static int 1411static int
1412isp1301_start_srp(struct otg_transceiver *dev) 1412isp1301_start_srp(struct usb_phy *dev)
1413{ 1413{
1414 struct isp1301 *isp = container_of(dev, struct isp1301, otg); 1414 struct isp1301 *isp = container_of(dev, struct isp1301, otg);
1415 u32 otg_ctrl; 1415 u32 otg_ctrl;
@@ -1436,7 +1436,7 @@ isp1301_start_srp(struct otg_transceiver *dev)
1436} 1436}
1437 1437
1438static int 1438static int
1439isp1301_start_hnp(struct otg_transceiver *dev) 1439isp1301_start_hnp(struct usb_phy *dev)
1440{ 1440{
1441#ifdef CONFIG_USB_OTG 1441#ifdef CONFIG_USB_OTG
1442 struct isp1301 *isp = container_of(dev, struct isp1301, otg); 1442 struct isp1301 *isp = container_of(dev, struct isp1301, otg);
diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index b276f8fcdeb..cba4737a04f 100644
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -235,7 +235,7 @@ static int msm_hsusb_ldo_set_mode(int on)
235 return ret < 0 ? ret : 0; 235 return ret < 0 ? ret : 0;
236} 236}
237 237
238static int ulpi_read(struct otg_transceiver *otg, u32 reg) 238static int ulpi_read(struct usb_phy *otg, u32 reg)
239{ 239{
240 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 240 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
241 int cnt = 0; 241 int cnt = 0;
@@ -260,7 +260,7 @@ static int ulpi_read(struct otg_transceiver *otg, u32 reg)
260 return ULPI_DATA_READ(readl(USB_ULPI_VIEWPORT)); 260 return ULPI_DATA_READ(readl(USB_ULPI_VIEWPORT));
261} 261}
262 262
263static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg) 263static int ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
264{ 264{
265 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 265 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
266 int cnt = 0; 266 int cnt = 0;
@@ -390,7 +390,7 @@ static int msm_otg_phy_reset(struct msm_otg *motg)
390} 390}
391 391
392#define LINK_RESET_TIMEOUT_USEC (250 * 1000) 392#define LINK_RESET_TIMEOUT_USEC (250 * 1000)
393static int msm_otg_reset(struct otg_transceiver *otg) 393static int msm_otg_reset(struct usb_phy *otg)
394{ 394{
395 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 395 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
396 struct msm_otg_platform_data *pdata = motg->pdata; 396 struct msm_otg_platform_data *pdata = motg->pdata;
@@ -448,7 +448,7 @@ static int msm_otg_reset(struct otg_transceiver *otg)
448#ifdef CONFIG_PM_SLEEP 448#ifdef CONFIG_PM_SLEEP
449static int msm_otg_suspend(struct msm_otg *motg) 449static int msm_otg_suspend(struct msm_otg *motg)
450{ 450{
451 struct otg_transceiver *otg = &motg->otg; 451 struct usb_phy *otg = &motg->otg;
452 struct usb_bus *bus = otg->host; 452 struct usb_bus *bus = otg->host;
453 struct msm_otg_platform_data *pdata = motg->pdata; 453 struct msm_otg_platform_data *pdata = motg->pdata;
454 int cnt = 0; 454 int cnt = 0;
@@ -543,7 +543,7 @@ static int msm_otg_suspend(struct msm_otg *motg)
543 543
544static int msm_otg_resume(struct msm_otg *motg) 544static int msm_otg_resume(struct msm_otg *motg)
545{ 545{
546 struct otg_transceiver *otg = &motg->otg; 546 struct usb_phy *otg = &motg->otg;
547 struct usb_bus *bus = otg->host; 547 struct usb_bus *bus = otg->host;
548 int cnt = 0; 548 int cnt = 0;
549 unsigned temp; 549 unsigned temp;
@@ -627,7 +627,7 @@ static void msm_otg_notify_charger(struct msm_otg *motg, unsigned mA)
627 motg->cur_power = mA; 627 motg->cur_power = mA;
628} 628}
629 629
630static int msm_otg_set_power(struct otg_transceiver *otg, unsigned mA) 630static int msm_otg_set_power(struct usb_phy *otg, unsigned mA)
631{ 631{
632 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 632 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
633 633
@@ -644,7 +644,7 @@ static int msm_otg_set_power(struct otg_transceiver *otg, unsigned mA)
644 return 0; 644 return 0;
645} 645}
646 646
647static void msm_otg_start_host(struct otg_transceiver *otg, int on) 647static void msm_otg_start_host(struct usb_phy *otg, int on)
648{ 648{
649 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 649 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
650 struct msm_otg_platform_data *pdata = motg->pdata; 650 struct msm_otg_platform_data *pdata = motg->pdata;
@@ -683,7 +683,7 @@ static void msm_otg_start_host(struct otg_transceiver *otg, int on)
683 } 683 }
684} 684}
685 685
686static int msm_otg_set_host(struct otg_transceiver *otg, struct usb_bus *host) 686static int msm_otg_set_host(struct usb_phy *otg, struct usb_bus *host)
687{ 687{
688 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 688 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
689 struct usb_hcd *hcd; 689 struct usb_hcd *hcd;
@@ -729,7 +729,7 @@ static int msm_otg_set_host(struct otg_transceiver *otg, struct usb_bus *host)
729 return 0; 729 return 0;
730} 730}
731 731
732static void msm_otg_start_peripheral(struct otg_transceiver *otg, int on) 732static void msm_otg_start_peripheral(struct usb_phy *otg, int on)
733{ 733{
734 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 734 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
735 struct msm_otg_platform_data *pdata = motg->pdata; 735 struct msm_otg_platform_data *pdata = motg->pdata;
@@ -756,7 +756,7 @@ static void msm_otg_start_peripheral(struct otg_transceiver *otg, int on)
756 756
757} 757}
758 758
759static int msm_otg_set_peripheral(struct otg_transceiver *otg, 759static int msm_otg_set_peripheral(struct usb_phy *otg,
760 struct usb_gadget *gadget) 760 struct usb_gadget *gadget)
761{ 761{
762 struct msm_otg *motg = container_of(otg, struct msm_otg, otg); 762 struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -800,7 +800,7 @@ static int msm_otg_set_peripheral(struct otg_transceiver *otg,
800 800
801static bool msm_chg_check_secondary_det(struct msm_otg *motg) 801static bool msm_chg_check_secondary_det(struct msm_otg *motg)
802{ 802{
803 struct otg_transceiver *otg = &motg->otg; 803 struct usb_phy *otg = &motg->otg;
804 u32 chg_det; 804 u32 chg_det;
805 bool ret = false; 805 bool ret = false;
806 806
@@ -821,7 +821,7 @@ static bool msm_chg_check_secondary_det(struct msm_otg *motg)
821 821
822static void msm_chg_enable_secondary_det(struct msm_otg *motg) 822static void msm_chg_enable_secondary_det(struct msm_otg *motg)
823{ 823{
824 struct otg_transceiver *otg = &motg->otg; 824 struct usb_phy *otg = &motg->otg;
825 u32 chg_det; 825 u32 chg_det;
826 826
827 switch (motg->pdata->phy_type) { 827 switch (motg->pdata->phy_type) {
@@ -861,7 +861,7 @@ static void msm_chg_enable_secondary_det(struct msm_otg *motg)
861 861
862static bool msm_chg_check_primary_det(struct msm_otg *motg) 862static bool msm_chg_check_primary_det(struct msm_otg *motg)
863{ 863{
864 struct otg_transceiver *otg = &motg->otg; 864 struct usb_phy *otg = &motg->otg;
865 u32 chg_det; 865 u32 chg_det;
866 bool ret = false; 866 bool ret = false;
867 867
@@ -882,7 +882,7 @@ static bool msm_chg_check_primary_det(struct msm_otg *motg)
882 882
883static void msm_chg_enable_primary_det(struct msm_otg *motg) 883static void msm_chg_enable_primary_det(struct msm_otg *motg)
884{ 884{
885 struct otg_transceiver *otg = &motg->otg; 885 struct usb_phy *otg = &motg->otg;
886 u32 chg_det; 886 u32 chg_det;
887 887
888 switch (motg->pdata->phy_type) { 888 switch (motg->pdata->phy_type) {
@@ -907,7 +907,7 @@ static void msm_chg_enable_primary_det(struct msm_otg *motg)
907 907
908static bool msm_chg_check_dcd(struct msm_otg *motg) 908static bool msm_chg_check_dcd(struct msm_otg *motg)
909{ 909{
910 struct otg_transceiver *otg = &motg->otg; 910 struct usb_phy *otg = &motg->otg;
911 u32 line_state; 911 u32 line_state;
912 bool ret = false; 912 bool ret = false;
913 913
@@ -928,7 +928,7 @@ static bool msm_chg_check_dcd(struct msm_otg *motg)
928 928
929static void msm_chg_disable_dcd(struct msm_otg *motg) 929static void msm_chg_disable_dcd(struct msm_otg *motg)
930{ 930{
931 struct otg_transceiver *otg = &motg->otg; 931 struct usb_phy *otg = &motg->otg;
932 u32 chg_det; 932 u32 chg_det;
933 933
934 switch (motg->pdata->phy_type) { 934 switch (motg->pdata->phy_type) {
@@ -947,7 +947,7 @@ static void msm_chg_disable_dcd(struct msm_otg *motg)
947 947
948static void msm_chg_enable_dcd(struct msm_otg *motg) 948static void msm_chg_enable_dcd(struct msm_otg *motg)
949{ 949{
950 struct otg_transceiver *otg = &motg->otg; 950 struct usb_phy *otg = &motg->otg;
951 u32 chg_det; 951 u32 chg_det;
952 952
953 switch (motg->pdata->phy_type) { 953 switch (motg->pdata->phy_type) {
@@ -968,7 +968,7 @@ static void msm_chg_enable_dcd(struct msm_otg *motg)
968 968
969static void msm_chg_block_on(struct msm_otg *motg) 969static void msm_chg_block_on(struct msm_otg *motg)
970{ 970{
971 struct otg_transceiver *otg = &motg->otg; 971 struct usb_phy *otg = &motg->otg;
972 u32 func_ctrl, chg_det; 972 u32 func_ctrl, chg_det;
973 973
974 /* put the controller in non-driving mode */ 974 /* put the controller in non-driving mode */
@@ -1003,7 +1003,7 @@ static void msm_chg_block_on(struct msm_otg *motg)
1003 1003
1004static void msm_chg_block_off(struct msm_otg *motg) 1004static void msm_chg_block_off(struct msm_otg *motg)
1005{ 1005{
1006 struct otg_transceiver *otg = &motg->otg; 1006 struct usb_phy *otg = &motg->otg;
1007 u32 func_ctrl, chg_det; 1007 u32 func_ctrl, chg_det;
1008 1008
1009 switch (motg->pdata->phy_type) { 1009 switch (motg->pdata->phy_type) {
@@ -1038,7 +1038,7 @@ static void msm_chg_block_off(struct msm_otg *motg)
1038static void msm_chg_detect_work(struct work_struct *w) 1038static void msm_chg_detect_work(struct work_struct *w)
1039{ 1039{
1040 struct msm_otg *motg = container_of(w, struct msm_otg, chg_work.work); 1040 struct msm_otg *motg = container_of(w, struct msm_otg, chg_work.work);
1041 struct otg_transceiver *otg = &motg->otg; 1041 struct usb_phy *otg = &motg->otg;
1042 bool is_dcd, tmout, vout; 1042 bool is_dcd, tmout, vout;
1043 unsigned long delay; 1043 unsigned long delay;
1044 1044
@@ -1152,7 +1152,7 @@ static void msm_otg_init_sm(struct msm_otg *motg)
1152static void msm_otg_sm_work(struct work_struct *w) 1152static void msm_otg_sm_work(struct work_struct *w)
1153{ 1153{
1154 struct msm_otg *motg = container_of(w, struct msm_otg, sm_work); 1154 struct msm_otg *motg = container_of(w, struct msm_otg, sm_work);
1155 struct otg_transceiver *otg = &motg->otg; 1155 struct usb_phy *otg = &motg->otg;
1156 1156
1157 switch (otg->state) { 1157 switch (otg->state) {
1158 case OTG_STATE_UNDEFINED: 1158 case OTG_STATE_UNDEFINED:
@@ -1243,7 +1243,7 @@ static void msm_otg_sm_work(struct work_struct *w)
1243static irqreturn_t msm_otg_irq(int irq, void *data) 1243static irqreturn_t msm_otg_irq(int irq, void *data)
1244{ 1244{
1245 struct msm_otg *motg = data; 1245 struct msm_otg *motg = data;
1246 struct otg_transceiver *otg = &motg->otg; 1246 struct usb_phy *otg = &motg->otg;
1247 u32 otgsc = 0; 1247 u32 otgsc = 0;
1248 1248
1249 if (atomic_read(&motg->in_lpm)) { 1249 if (atomic_read(&motg->in_lpm)) {
@@ -1281,7 +1281,7 @@ static irqreturn_t msm_otg_irq(int irq, void *data)
1281static int msm_otg_mode_show(struct seq_file *s, void *unused) 1281static int msm_otg_mode_show(struct seq_file *s, void *unused)
1282{ 1282{
1283 struct msm_otg *motg = s->private; 1283 struct msm_otg *motg = s->private;
1284 struct otg_transceiver *otg = &motg->otg; 1284 struct usb_phy *otg = &motg->otg;
1285 1285
1286 switch (otg->state) { 1286 switch (otg->state) {
1287 case OTG_STATE_A_HOST: 1287 case OTG_STATE_A_HOST:
@@ -1309,7 +1309,7 @@ static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
1309 struct seq_file *s = file->private_data; 1309 struct seq_file *s = file->private_data;
1310 struct msm_otg *motg = s->private; 1310 struct msm_otg *motg = s->private;
1311 char buf[16]; 1311 char buf[16];
1312 struct otg_transceiver *otg = &motg->otg; 1312 struct usb_phy *otg = &motg->otg;
1313 int status = count; 1313 int status = count;
1314 enum usb_mode_type req_mode; 1314 enum usb_mode_type req_mode;
1315 1315
@@ -1414,7 +1414,7 @@ static int __init msm_otg_probe(struct platform_device *pdev)
1414 int ret = 0; 1414 int ret = 0;
1415 struct resource *res; 1415 struct resource *res;
1416 struct msm_otg *motg; 1416 struct msm_otg *motg;
1417 struct otg_transceiver *otg; 1417 struct usb_phy *otg;
1418 1418
1419 dev_info(&pdev->dev, "msm_otg probe\n"); 1419 dev_info(&pdev->dev, "msm_otg probe\n");
1420 if (!pdev->dev.platform_data) { 1420 if (!pdev->dev.platform_data) {
@@ -1598,7 +1598,7 @@ free_motg:
1598static int __devexit msm_otg_remove(struct platform_device *pdev) 1598static int __devexit msm_otg_remove(struct platform_device *pdev)
1599{ 1599{
1600 struct msm_otg *motg = platform_get_drvdata(pdev); 1600 struct msm_otg *motg = platform_get_drvdata(pdev);
1601 struct otg_transceiver *otg = &motg->otg; 1601 struct usb_phy *otg = &motg->otg;
1602 int cnt = 0; 1602 int cnt = 0;
1603 1603
1604 if (otg->host || otg->gadget) 1604 if (otg->host || otg->gadget)
@@ -1660,7 +1660,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
1660static int msm_otg_runtime_idle(struct device *dev) 1660static int msm_otg_runtime_idle(struct device *dev)
1661{ 1661{
1662 struct msm_otg *motg = dev_get_drvdata(dev); 1662 struct msm_otg *motg = dev_get_drvdata(dev);
1663 struct otg_transceiver *otg = &motg->otg; 1663 struct usb_phy *otg = &motg->otg;
1664 1664
1665 dev_dbg(dev, "OTG runtime idle\n"); 1665 dev_dbg(dev, "OTG runtime idle\n");
1666 1666
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index b5fbe1452ab..6e05d58effe 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -55,7 +55,7 @@ static char *state_string[] = {
55 "a_vbus_err" 55 "a_vbus_err"
56}; 56};
57 57
58static int mv_otg_set_vbus(struct otg_transceiver *otg, bool on) 58static int mv_otg_set_vbus(struct usb_phy *otg, bool on)
59{ 59{
60 struct mv_otg *mvotg = container_of(otg, struct mv_otg, otg); 60 struct mv_otg *mvotg = container_of(otg, struct mv_otg, otg);
61 if (mvotg->pdata->set_vbus == NULL) 61 if (mvotg->pdata->set_vbus == NULL)
@@ -64,7 +64,7 @@ static int mv_otg_set_vbus(struct otg_transceiver *otg, bool on)
64 return mvotg->pdata->set_vbus(on); 64 return mvotg->pdata->set_vbus(on);
65} 65}
66 66
67static int mv_otg_set_host(struct otg_transceiver *otg, 67static int mv_otg_set_host(struct usb_phy *otg,
68 struct usb_bus *host) 68 struct usb_bus *host)
69{ 69{
70 otg->host = host; 70 otg->host = host;
@@ -72,7 +72,7 @@ static int mv_otg_set_host(struct otg_transceiver *otg,
72 return 0; 72 return 0;
73} 73}
74 74
75static int mv_otg_set_peripheral(struct otg_transceiver *otg, 75static int mv_otg_set_peripheral(struct usb_phy *otg,
76 struct usb_gadget *gadget) 76 struct usb_gadget *gadget)
77{ 77{
78 otg->gadget = gadget; 78 otg->gadget = gadget;
@@ -203,7 +203,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg)
203static void mv_otg_start_host(struct mv_otg *mvotg, int on) 203static void mv_otg_start_host(struct mv_otg *mvotg, int on)
204{ 204{
205#ifdef CONFIG_USB 205#ifdef CONFIG_USB
206 struct otg_transceiver *otg = &mvotg->otg; 206 struct usb_phy *otg = &mvotg->otg;
207 struct usb_hcd *hcd; 207 struct usb_hcd *hcd;
208 208
209 if (!otg->host) 209 if (!otg->host)
@@ -222,7 +222,7 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on)
222 222
223static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on) 223static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)
224{ 224{
225 struct otg_transceiver *otg = &mvotg->otg; 225 struct usb_phy *otg = &mvotg->otg;
226 226
227 if (!otg->gadget) 227 if (!otg->gadget)
228 return; 228 return;
@@ -343,7 +343,7 @@ static void mv_otg_update_inputs(struct mv_otg *mvotg)
343static void mv_otg_update_state(struct mv_otg *mvotg) 343static void mv_otg_update_state(struct mv_otg *mvotg)
344{ 344{
345 struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl; 345 struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl;
346 struct otg_transceiver *otg = &mvotg->otg; 346 struct usb_phy *otg = &mvotg->otg;
347 int old_state = otg->state; 347 int old_state = otg->state;
348 348
349 switch (old_state) { 349 switch (old_state) {
@@ -416,7 +416,7 @@ static void mv_otg_update_state(struct mv_otg *mvotg)
416static void mv_otg_work(struct work_struct *work) 416static void mv_otg_work(struct work_struct *work)
417{ 417{
418 struct mv_otg *mvotg; 418 struct mv_otg *mvotg;
419 struct otg_transceiver *otg; 419 struct usb_phy *otg;
420 int old_state; 420 int old_state;
421 421
422 mvotg = container_of((struct delayed_work *)work, struct mv_otg, work); 422 mvotg = container_of((struct delayed_work *)work, struct mv_otg, work);
diff --git a/drivers/usb/otg/mv_otg.h b/drivers/usb/otg/mv_otg.h
index be6ca143764..a74ee07a272 100644
--- a/drivers/usb/otg/mv_otg.h
+++ b/drivers/usb/otg/mv_otg.h
@@ -136,7 +136,7 @@ struct mv_otg_regs {
136}; 136};
137 137
138struct mv_otg { 138struct mv_otg {
139 struct otg_transceiver otg; 139 struct usb_phy otg;
140 struct mv_otg_ctrl otg_ctrl; 140 struct mv_otg_ctrl otg_ctrl;
141 141
142 /* base address */ 142 /* base address */
diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c
index c1e36004643..2ab02799706 100644
--- a/drivers/usb/otg/nop-usb-xceiv.c
+++ b/drivers/usb/otg/nop-usb-xceiv.c
@@ -33,7 +33,7 @@
33#include <linux/slab.h> 33#include <linux/slab.h>
34 34
35struct nop_usb_xceiv { 35struct nop_usb_xceiv {
36 struct otg_transceiver otg; 36 struct usb_phy otg;
37 struct device *dev; 37 struct device *dev;
38}; 38};
39 39
@@ -58,17 +58,17 @@ void usb_nop_xceiv_unregister(void)
58} 58}
59EXPORT_SYMBOL(usb_nop_xceiv_unregister); 59EXPORT_SYMBOL(usb_nop_xceiv_unregister);
60 60
61static inline struct nop_usb_xceiv *xceiv_to_nop(struct otg_transceiver *x) 61static inline struct nop_usb_xceiv *xceiv_to_nop(struct usb_phy *x)
62{ 62{
63 return container_of(x, struct nop_usb_xceiv, otg); 63 return container_of(x, struct nop_usb_xceiv, otg);
64} 64}
65 65
66static int nop_set_suspend(struct otg_transceiver *x, int suspend) 66static int nop_set_suspend(struct usb_phy *x, int suspend)
67{ 67{
68 return 0; 68 return 0;
69} 69}
70 70
71static int nop_set_peripheral(struct otg_transceiver *x, 71static int nop_set_peripheral(struct usb_phy *x,
72 struct usb_gadget *gadget) 72 struct usb_gadget *gadget)
73{ 73{
74 struct nop_usb_xceiv *nop; 74 struct nop_usb_xceiv *nop;
@@ -88,7 +88,7 @@ static int nop_set_peripheral(struct otg_transceiver *x,
88 return 0; 88 return 0;
89} 89}
90 90
91static int nop_set_host(struct otg_transceiver *x, struct usb_bus *host) 91static int nop_set_host(struct usb_phy *x, struct usb_bus *host)
92{ 92{
93 struct nop_usb_xceiv *nop; 93 struct nop_usb_xceiv *nop;
94 94
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index 307c27bc51e..56c0f1781d8 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -15,7 +15,7 @@
15 15
16#include <linux/usb/otg.h> 16#include <linux/usb/otg.h>
17 17
18static struct otg_transceiver *xceiv; 18static struct usb_phy *xceiv;
19 19
20/** 20/**
21 * otg_get_transceiver - find the (single) OTG transceiver 21 * otg_get_transceiver - find the (single) OTG transceiver
@@ -26,7 +26,7 @@ static struct otg_transceiver *xceiv;
26 * 26 *
27 * For use by USB host and peripheral drivers. 27 * For use by USB host and peripheral drivers.
28 */ 28 */
29struct otg_transceiver *otg_get_transceiver(void) 29struct usb_phy *otg_get_transceiver(void)
30{ 30{
31 if (xceiv) 31 if (xceiv)
32 get_device(xceiv->dev); 32 get_device(xceiv->dev);
@@ -42,7 +42,7 @@ EXPORT_SYMBOL(otg_get_transceiver);
42 * 42 *
43 * For use by USB host and peripheral drivers. 43 * For use by USB host and peripheral drivers.
44 */ 44 */
45void otg_put_transceiver(struct otg_transceiver *x) 45void otg_put_transceiver(struct usb_phy *x)
46{ 46{
47 if (x) 47 if (x)
48 put_device(x->dev); 48 put_device(x->dev);
@@ -57,7 +57,7 @@ EXPORT_SYMBOL(otg_put_transceiver);
57 * coordinate the activities of drivers for host and peripheral 57 * coordinate the activities of drivers for host and peripheral
58 * controllers, and in some cases for VBUS current regulation. 58 * controllers, and in some cases for VBUS current regulation.
59 */ 59 */
60int otg_set_transceiver(struct otg_transceiver *x) 60int otg_set_transceiver(struct usb_phy *x)
61{ 61{
62 if (xceiv && x) 62 if (xceiv && x)
63 return -EBUSY; 63 return -EBUSY;
diff --git a/drivers/usb/otg/otg_fsm.h b/drivers/usb/otg/otg_fsm.h
index 0cecf1d593a..5e589ae9a19 100644
--- a/drivers/usb/otg/otg_fsm.h
+++ b/drivers/usb/otg/otg_fsm.h
@@ -82,7 +82,7 @@ struct otg_fsm {
82 int loc_sof; 82 int loc_sof;
83 83
84 struct otg_fsm_ops *ops; 84 struct otg_fsm_ops *ops;
85 struct otg_transceiver *transceiver; 85 struct usb_phy *transceiver;
86 86
87 /* Current usb protocol used: 0:undefine; 1:host; 2:client */ 87 /* Current usb protocol used: 0:undefine; 1:host; 2:client */
88 int protocol; 88 int protocol;
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 14f66c35862..beeecc239d1 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -144,7 +144,7 @@
144#define GPIO_USB_4PIN_ULPI_2430C (3 << 0) 144#define GPIO_USB_4PIN_ULPI_2430C (3 << 0)
145 145
146struct twl4030_usb { 146struct twl4030_usb {
147 struct otg_transceiver otg; 147 struct usb_phy otg;
148 struct device *dev; 148 struct device *dev;
149 149
150 /* TWL4030 internal USB regulator supplies */ 150 /* TWL4030 internal USB regulator supplies */
@@ -548,7 +548,7 @@ static void twl4030_usb_phy_init(struct twl4030_usb *twl)
548 sysfs_notify(&twl->dev->kobj, NULL, "vbus"); 548 sysfs_notify(&twl->dev->kobj, NULL, "vbus");
549} 549}
550 550
551static int twl4030_set_suspend(struct otg_transceiver *x, int suspend) 551static int twl4030_set_suspend(struct usb_phy *x, int suspend)
552{ 552{
553 struct twl4030_usb *twl = xceiv_to_twl(x); 553 struct twl4030_usb *twl = xceiv_to_twl(x);
554 554
@@ -560,7 +560,7 @@ static int twl4030_set_suspend(struct otg_transceiver *x, int suspend)
560 return 0; 560 return 0;
561} 561}
562 562
563static int twl4030_set_peripheral(struct otg_transceiver *x, 563static int twl4030_set_peripheral(struct usb_phy *x,
564 struct usb_gadget *gadget) 564 struct usb_gadget *gadget)
565{ 565{
566 struct twl4030_usb *twl; 566 struct twl4030_usb *twl;
@@ -576,7 +576,7 @@ static int twl4030_set_peripheral(struct otg_transceiver *x,
576 return 0; 576 return 0;
577} 577}
578 578
579static int twl4030_set_host(struct otg_transceiver *x, struct usb_bus *host) 579static int twl4030_set_host(struct usb_phy *x, struct usb_bus *host)
580{ 580{
581 struct twl4030_usb *twl; 581 struct twl4030_usb *twl;
582 582
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index ed2b26cfe81..56c4d3d50eb 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -87,7 +87,7 @@
87#define VBUS_DET BIT(2) 87#define VBUS_DET BIT(2)
88 88
89struct twl6030_usb { 89struct twl6030_usb {
90 struct otg_transceiver otg; 90 struct usb_phy otg;
91 struct device *dev; 91 struct device *dev;
92 92
93 /* for vbus reporting with irqs disabled */ 93 /* for vbus reporting with irqs disabled */
@@ -137,7 +137,7 @@ static inline u8 twl6030_readb(struct twl6030_usb *twl, u8 module, u8 address)
137 return ret; 137 return ret;
138} 138}
139 139
140static int twl6030_phy_init(struct otg_transceiver *x) 140static int twl6030_phy_init(struct usb_phy *x)
141{ 141{
142 struct twl6030_usb *twl; 142 struct twl6030_usb *twl;
143 struct device *dev; 143 struct device *dev;
@@ -155,7 +155,7 @@ static int twl6030_phy_init(struct otg_transceiver *x)
155 return 0; 155 return 0;
156} 156}
157 157
158static void twl6030_phy_shutdown(struct otg_transceiver *x) 158static void twl6030_phy_shutdown(struct usb_phy *x)
159{ 159{
160 struct twl6030_usb *twl; 160 struct twl6030_usb *twl;
161 struct device *dev; 161 struct device *dev;
@@ -167,7 +167,7 @@ static void twl6030_phy_shutdown(struct otg_transceiver *x)
167 pdata->phy_power(twl->dev, 0, 0); 167 pdata->phy_power(twl->dev, 0, 0);
168} 168}
169 169
170static int twl6030_phy_suspend(struct otg_transceiver *x, int suspend) 170static int twl6030_phy_suspend(struct usb_phy *x, int suspend)
171{ 171{
172 struct twl6030_usb *twl = xceiv_to_twl(x); 172 struct twl6030_usb *twl = xceiv_to_twl(x);
173 struct device *dev = twl->dev; 173 struct device *dev = twl->dev;
@@ -178,7 +178,7 @@ static int twl6030_phy_suspend(struct otg_transceiver *x, int suspend)
178 return 0; 178 return 0;
179} 179}
180 180
181static int twl6030_start_srp(struct otg_transceiver *x) 181static int twl6030_start_srp(struct usb_phy *x)
182{ 182{
183 struct twl6030_usb *twl = xceiv_to_twl(x); 183 struct twl6030_usb *twl = xceiv_to_twl(x);
184 184
@@ -324,7 +324,7 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
324 return IRQ_HANDLED; 324 return IRQ_HANDLED;
325} 325}
326 326
327static int twl6030_set_peripheral(struct otg_transceiver *x, 327static int twl6030_set_peripheral(struct usb_phy *x,
328 struct usb_gadget *gadget) 328 struct usb_gadget *gadget)
329{ 329{
330 struct twl6030_usb *twl; 330 struct twl6030_usb *twl;
@@ -340,7 +340,7 @@ static int twl6030_set_peripheral(struct otg_transceiver *x,
340 return 0; 340 return 0;
341} 341}
342 342
343static int twl6030_enable_irq(struct otg_transceiver *x) 343static int twl6030_enable_irq(struct usb_phy *x)
344{ 344{
345 struct twl6030_usb *twl = xceiv_to_twl(x); 345 struct twl6030_usb *twl = xceiv_to_twl(x);
346 346
@@ -376,7 +376,7 @@ static void otg_set_vbus_work(struct work_struct *data)
376 CHARGERUSB_CTRL1); 376 CHARGERUSB_CTRL1);
377} 377}
378 378
379static int twl6030_set_vbus(struct otg_transceiver *x, bool enabled) 379static int twl6030_set_vbus(struct usb_phy *x, bool enabled)
380{ 380{
381 struct twl6030_usb *twl = xceiv_to_twl(x); 381 struct twl6030_usb *twl = xceiv_to_twl(x);
382 382
@@ -386,7 +386,7 @@ static int twl6030_set_vbus(struct otg_transceiver *x, bool enabled)
386 return 0; 386 return 0;
387} 387}
388 388
389static int twl6030_set_host(struct otg_transceiver *x, struct usb_bus *host) 389static int twl6030_set_host(struct usb_phy *x, struct usb_bus *host)
390{ 390{
391 struct twl6030_usb *twl; 391 struct twl6030_usb *twl;
392 392
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 0b0466728fd..51841ed829a 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -49,7 +49,7 @@ static struct ulpi_info ulpi_ids[] = {
49 ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"), 49 ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
50}; 50};
51 51
52static int ulpi_set_otg_flags(struct otg_transceiver *otg) 52static int ulpi_set_otg_flags(struct usb_phy *otg)
53{ 53{
54 unsigned int flags = ULPI_OTG_CTRL_DP_PULLDOWN | 54 unsigned int flags = ULPI_OTG_CTRL_DP_PULLDOWN |
55 ULPI_OTG_CTRL_DM_PULLDOWN; 55 ULPI_OTG_CTRL_DM_PULLDOWN;
@@ -73,7 +73,7 @@ static int ulpi_set_otg_flags(struct otg_transceiver *otg)
73 return otg_io_write(otg, flags, ULPI_OTG_CTRL); 73 return otg_io_write(otg, flags, ULPI_OTG_CTRL);
74} 74}
75 75
76static int ulpi_set_fc_flags(struct otg_transceiver *otg) 76static int ulpi_set_fc_flags(struct usb_phy *otg)
77{ 77{
78 unsigned int flags = 0; 78 unsigned int flags = 0;
79 79
@@ -115,7 +115,7 @@ static int ulpi_set_fc_flags(struct otg_transceiver *otg)
115 return otg_io_write(otg, flags, ULPI_FUNC_CTRL); 115 return otg_io_write(otg, flags, ULPI_FUNC_CTRL);
116} 116}
117 117
118static int ulpi_set_ic_flags(struct otg_transceiver *otg) 118static int ulpi_set_ic_flags(struct usb_phy *otg)
119{ 119{
120 unsigned int flags = 0; 120 unsigned int flags = 0;
121 121
@@ -134,7 +134,7 @@ static int ulpi_set_ic_flags(struct otg_transceiver *otg)
134 return otg_io_write(otg, flags, ULPI_IFC_CTRL); 134 return otg_io_write(otg, flags, ULPI_IFC_CTRL);
135} 135}
136 136
137static int ulpi_set_flags(struct otg_transceiver *otg) 137static int ulpi_set_flags(struct usb_phy *otg)
138{ 138{
139 int ret; 139 int ret;
140 140
@@ -149,7 +149,7 @@ static int ulpi_set_flags(struct otg_transceiver *otg)
149 return ulpi_set_fc_flags(otg); 149 return ulpi_set_fc_flags(otg);
150} 150}
151 151
152static int ulpi_check_integrity(struct otg_transceiver *otg) 152static int ulpi_check_integrity(struct usb_phy *otg)
153{ 153{
154 int ret, i; 154 int ret, i;
155 unsigned int val = 0x55; 155 unsigned int val = 0x55;
@@ -175,7 +175,7 @@ static int ulpi_check_integrity(struct otg_transceiver *otg)
175 return 0; 175 return 0;
176} 176}
177 177
178static int ulpi_init(struct otg_transceiver *otg) 178static int ulpi_init(struct usb_phy *otg)
179{ 179{
180 int i, vid, pid, ret; 180 int i, vid, pid, ret;
181 u32 ulpi_id = 0; 181 u32 ulpi_id = 0;
@@ -206,7 +206,7 @@ static int ulpi_init(struct otg_transceiver *otg)
206 return ulpi_set_flags(otg); 206 return ulpi_set_flags(otg);
207} 207}
208 208
209static int ulpi_set_host(struct otg_transceiver *otg, struct usb_bus *host) 209static int ulpi_set_host(struct usb_phy *otg, struct usb_bus *host)
210{ 210{
211 unsigned int flags = otg_io_read(otg, ULPI_IFC_CTRL); 211 unsigned int flags = otg_io_read(otg, ULPI_IFC_CTRL);
212 212
@@ -231,7 +231,7 @@ static int ulpi_set_host(struct otg_transceiver *otg, struct usb_bus *host)
231 return otg_io_write(otg, flags, ULPI_IFC_CTRL); 231 return otg_io_write(otg, flags, ULPI_IFC_CTRL);
232} 232}
233 233
234static int ulpi_set_vbus(struct otg_transceiver *otg, bool on) 234static int ulpi_set_vbus(struct usb_phy *otg, bool on)
235{ 235{
236 unsigned int flags = otg_io_read(otg, ULPI_OTG_CTRL); 236 unsigned int flags = otg_io_read(otg, ULPI_OTG_CTRL);
237 237
@@ -248,11 +248,11 @@ static int ulpi_set_vbus(struct otg_transceiver *otg, bool on)
248 return otg_io_write(otg, flags, ULPI_OTG_CTRL); 248 return otg_io_write(otg, flags, ULPI_OTG_CTRL);
249} 249}
250 250
251struct otg_transceiver * 251struct usb_phy *
252otg_ulpi_create(struct otg_io_access_ops *ops, 252otg_ulpi_create(struct otg_io_access_ops *ops,
253 unsigned int flags) 253 unsigned int flags)
254{ 254{
255 struct otg_transceiver *otg; 255 struct usb_phy *otg;
256 256
257 otg = kzalloc(sizeof(*otg), GFP_KERNEL); 257 otg = kzalloc(sizeof(*otg), GFP_KERNEL);
258 if (!otg) 258 if (!otg)
diff --git a/drivers/usb/otg/ulpi_viewport.c b/drivers/usb/otg/ulpi_viewport.c
index e9a37f90994..e7b311b960b 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)
40 return -ETIMEDOUT; 40 return -ETIMEDOUT;
41} 41}
42 42
43static int ulpi_viewport_read(struct otg_transceiver *otg, u32 reg) 43static int ulpi_viewport_read(struct usb_phy *otg, u32 reg)
44{ 44{
45 int ret; 45 int ret;
46 void __iomem *view = otg->io_priv; 46 void __iomem *view = otg->io_priv;
@@ -58,7 +58,7 @@ static int ulpi_viewport_read(struct otg_transceiver *otg, u32 reg)
58 return ULPI_VIEW_DATA_READ(readl(view)); 58 return ULPI_VIEW_DATA_READ(readl(view));
59} 59}
60 60
61static int ulpi_viewport_write(struct otg_transceiver *otg, u32 val, u32 reg) 61static int ulpi_viewport_write(struct usb_phy *otg, u32 val, u32 reg)
62{ 62{
63 int ret; 63 int ret;
64 void __iomem *view = otg->io_priv; 64 void __iomem *view = otg->io_priv;
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 {
104/* 104/*
105 * the Intel MID (Langwell/Penwell) otg transceiver driver needs to interact 105 * the Intel MID (Langwell/Penwell) otg transceiver driver needs to interact
106 * with device and host drivers to implement the USB OTG related feature. More 106 * with device and host drivers to implement the USB OTG related feature. More
107 * function members are added based on otg_transceiver data structure for this 107 * function members are added based on usb_phy data structure for this
108 * purpose. 108 * purpose.
109 */ 109 */
110struct intel_mid_otg_xceiv { 110struct intel_mid_otg_xceiv {
111 struct otg_transceiver otg; 111 struct usb_phy otg;
112 struct otg_hsm hsm; 112 struct otg_hsm hsm;
113 113
114 /* base address */ 114 /* base address */
@@ -147,7 +147,7 @@ struct intel_mid_otg_xceiv {
147 147
148}; 148};
149static inline 149static inline
150struct intel_mid_otg_xceiv *otg_to_mid_xceiv(struct otg_transceiver *otg) 150struct intel_mid_otg_xceiv *otg_to_mid_xceiv(struct usb_phy *otg)
151{ 151{
152 return container_of(otg, struct intel_mid_otg_xceiv, otg); 152 return container_of(otg, struct intel_mid_otg_xceiv, otg);
153} 153}
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index 00311fe9d0d..2d3547ae956 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -160,7 +160,7 @@ struct msm_otg_platform_data {
160 * detection process. 160 * detection process.
161 */ 161 */
162struct msm_otg { 162struct msm_otg {
163 struct otg_transceiver otg; 163 struct usb_phy otg;
164 struct msm_otg_platform_data *pdata; 164 struct msm_otg_platform_data *pdata;
165 int irq; 165 int irq;
166 struct clk *clk; 166 struct clk *clk;
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index d87f44f5b04..e0bc55702a8 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -43,14 +43,14 @@ enum usb_xceiv_events {
43 USB_EVENT_ENUMERATED, /* gadget driver enumerated */ 43 USB_EVENT_ENUMERATED, /* gadget driver enumerated */
44}; 44};
45 45
46struct otg_transceiver; 46struct usb_phy;
47 47
48/* for transceivers connected thru an ULPI interface, the user must 48/* for transceivers connected thru an ULPI interface, the user must
49 * provide access ops 49 * provide access ops
50 */ 50 */
51struct otg_io_access_ops { 51struct otg_io_access_ops {
52 int (*read)(struct otg_transceiver *otg, u32 reg); 52 int (*read)(struct usb_phy *x, u32 reg);
53 int (*write)(struct otg_transceiver *otg, u32 val, u32 reg); 53 int (*write)(struct usb_phy *x, u32 val, u32 reg);
54}; 54};
55 55
56/* 56/*
@@ -59,7 +59,7 @@ struct otg_io_access_ops {
59 * moment, using the transceiver, ID signal, HNP and sometimes static 59 * moment, using the transceiver, ID signal, HNP and sometimes static
60 * configuration information (including "board isn't wired for otg"). 60 * configuration information (including "board isn't wired for otg").
61 */ 61 */
62struct otg_transceiver { 62struct usb_phy {
63 struct device *dev; 63 struct device *dev;
64 const char *label; 64 const char *label;
65 unsigned int flags; 65 unsigned int flags;
@@ -82,40 +82,40 @@ struct otg_transceiver {
82 u16 port_change; 82 u16 port_change;
83 83
84 /* initialize/shutdown the OTG controller */ 84 /* initialize/shutdown the OTG controller */
85 int (*init)(struct otg_transceiver *otg); 85 int (*init)(struct usb_phy *x);
86 void (*shutdown)(struct otg_transceiver *otg); 86 void (*shutdown)(struct usb_phy *x);
87 87
88 /* bind/unbind the host controller */ 88 /* bind/unbind the host controller */
89 int (*set_host)(struct otg_transceiver *otg, 89 int (*set_host)(struct usb_phy *x,
90 struct usb_bus *host); 90 struct usb_bus *host);
91 91
92 /* bind/unbind the peripheral controller */ 92 /* bind/unbind the peripheral controller */
93 int (*set_peripheral)(struct otg_transceiver *otg, 93 int (*set_peripheral)(struct usb_phy *x,
94 struct usb_gadget *gadget); 94 struct usb_gadget *gadget);
95 95
96 /* effective for B devices, ignored for A-peripheral */ 96 /* effective for B devices, ignored for A-peripheral */
97 int (*set_power)(struct otg_transceiver *otg, 97 int (*set_power)(struct usb_phy *x,
98 unsigned mA); 98 unsigned mA);
99 99
100 /* effective for A-peripheral, ignored for B devices */ 100 /* effective for A-peripheral, ignored for B devices */
101 int (*set_vbus)(struct otg_transceiver *otg, 101 int (*set_vbus)(struct usb_phy *x,
102 bool enabled); 102 bool enabled);
103 103
104 /* for non-OTG B devices: set transceiver into suspend mode */ 104 /* for non-OTG B devices: set transceiver into suspend mode */
105 int (*set_suspend)(struct otg_transceiver *otg, 105 int (*set_suspend)(struct usb_phy *x,
106 int suspend); 106 int suspend);
107 107
108 /* for B devices only: start session with A-Host */ 108 /* for B devices only: start session with A-Host */
109 int (*start_srp)(struct otg_transceiver *otg); 109 int (*start_srp)(struct usb_phy *x);
110 110
111 /* start or continue HNP role switch */ 111 /* start or continue HNP role switch */
112 int (*start_hnp)(struct otg_transceiver *otg); 112 int (*start_hnp)(struct usb_phy *x);
113 113
114}; 114};
115 115
116 116
117/* for board-specific init logic */ 117/* for board-specific init logic */
118extern int otg_set_transceiver(struct otg_transceiver *); 118extern int otg_set_transceiver(struct usb_phy *);
119 119
120#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) 120#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
121/* sometimes transceivers are accessed only through e.g. ULPI */ 121/* sometimes transceivers are accessed only through e.g. ULPI */
@@ -132,50 +132,50 @@ static inline void usb_nop_xceiv_unregister(void)
132#endif 132#endif
133 133
134/* helpers for direct access thru low-level io interface */ 134/* helpers for direct access thru low-level io interface */
135static inline int otg_io_read(struct otg_transceiver *otg, u32 reg) 135static inline int otg_io_read(struct usb_phy *x, u32 reg)
136{ 136{
137 if (otg->io_ops && otg->io_ops->read) 137 if (x->io_ops && x->io_ops->read)
138 return otg->io_ops->read(otg, reg); 138 return x->io_ops->read(x, reg);
139 139
140 return -EINVAL; 140 return -EINVAL;
141} 141}
142 142
143static inline int otg_io_write(struct otg_transceiver *otg, u32 val, u32 reg) 143static inline int otg_io_write(struct usb_phy *x, u32 val, u32 reg)
144{ 144{
145 if (otg->io_ops && otg->io_ops->write) 145 if (x->io_ops && x->io_ops->write)
146 return otg->io_ops->write(otg, val, reg); 146 return x->io_ops->write(x, val, reg);
147 147
148 return -EINVAL; 148 return -EINVAL;
149} 149}
150 150
151static inline int 151static inline int
152otg_init(struct otg_transceiver *otg) 152otg_init(struct usb_phy *x)
153{ 153{
154 if (otg->init) 154 if (x->init)
155 return otg->init(otg); 155 return x->init(x);
156 156
157 return 0; 157 return 0;
158} 158}
159 159
160static inline void 160static inline void
161otg_shutdown(struct otg_transceiver *otg) 161otg_shutdown(struct usb_phy *x)
162{ 162{
163 if (otg->shutdown) 163 if (x->shutdown)
164 otg->shutdown(otg); 164 x->shutdown(x);
165} 165}
166 166
167/* for usb host and peripheral controller drivers */ 167/* for usb host and peripheral controller drivers */
168#ifdef CONFIG_USB_OTG_UTILS 168#ifdef CONFIG_USB_OTG_UTILS
169extern struct otg_transceiver *otg_get_transceiver(void); 169extern struct usb_phy *otg_get_transceiver(void);
170extern void otg_put_transceiver(struct otg_transceiver *); 170extern void otg_put_transceiver(struct usb_phy *);
171extern const char *otg_state_string(enum usb_otg_state state); 171extern const char *otg_state_string(enum usb_otg_state state);
172#else 172#else
173static inline struct otg_transceiver *otg_get_transceiver(void) 173static inline struct usb_phy *otg_get_transceiver(void)
174{ 174{
175 return NULL; 175 return NULL;
176} 176}
177 177
178static inline void otg_put_transceiver(struct otg_transceiver *x) 178static inline void otg_put_transceiver(struct usb_phy *x)
179{ 179{
180} 180}
181 181
@@ -187,67 +187,67 @@ static inline const char *otg_state_string(enum usb_otg_state state)
187 187
188/* Context: can sleep */ 188/* Context: can sleep */
189static inline int 189static inline int
190otg_start_hnp(struct otg_transceiver *otg) 190otg_start_hnp(struct usb_phy *x)
191{ 191{
192 return otg->start_hnp(otg); 192 return x->start_hnp(x);
193} 193}
194 194
195/* Context: can sleep */ 195/* Context: can sleep */
196static inline int 196static inline int
197otg_set_vbus(struct otg_transceiver *otg, bool enabled) 197otg_set_vbus(struct usb_phy *x, bool enabled)
198{ 198{
199 return otg->set_vbus(otg, enabled); 199 return x->set_vbus(x, enabled);
200} 200}
201 201
202/* for HCDs */ 202/* for HCDs */
203static inline int 203static inline int
204otg_set_host(struct otg_transceiver *otg, struct usb_bus *host) 204otg_set_host(struct usb_phy *x, struct usb_bus *host)
205{ 205{
206 return otg->set_host(otg, host); 206 return x->set_host(x, host);
207} 207}
208 208
209/* for usb peripheral controller drivers */ 209/* for usb peripheral controller drivers */
210 210
211/* Context: can sleep */ 211/* Context: can sleep */
212static inline int 212static inline int
213otg_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *periph) 213otg_set_peripheral(struct usb_phy *x, struct usb_gadget *periph)
214{ 214{
215 return otg->set_peripheral(otg, periph); 215 return x->set_peripheral(x, periph);
216} 216}
217 217
218static inline int 218static inline int
219otg_set_power(struct otg_transceiver *otg, unsigned mA) 219otg_set_power(struct usb_phy *x, unsigned mA)
220{ 220{
221 return otg->set_power(otg, mA); 221 return x->set_power(x, mA);
222} 222}
223 223
224/* Context: can sleep */ 224/* Context: can sleep */
225static inline int 225static inline int
226otg_set_suspend(struct otg_transceiver *otg, int suspend) 226otg_set_suspend(struct usb_phy *x, int suspend)
227{ 227{
228 if (otg->set_suspend != NULL) 228 if (x->set_suspend != NULL)
229 return otg->set_suspend(otg, suspend); 229 return x->set_suspend(x, suspend);
230 else 230 else
231 return 0; 231 return 0;
232} 232}
233 233
234static inline int 234static inline int
235otg_start_srp(struct otg_transceiver *otg) 235otg_start_srp(struct usb_phy *x)
236{ 236{
237 return otg->start_srp(otg); 237 return x->start_srp(x);
238} 238}
239 239
240/* notifiers */ 240/* notifiers */
241static inline int 241static inline int
242otg_register_notifier(struct otg_transceiver *otg, struct notifier_block *nb) 242otg_register_notifier(struct usb_phy *x, struct notifier_block *nb)
243{ 243{
244 return atomic_notifier_chain_register(&otg->notifier, nb); 244 return atomic_notifier_chain_register(&x->notifier, nb);
245} 245}
246 246
247static inline void 247static inline void
248otg_unregister_notifier(struct otg_transceiver *otg, struct notifier_block *nb) 248otg_unregister_notifier(struct usb_phy *x, struct notifier_block *nb)
249{ 249{
250 atomic_notifier_chain_unregister(&otg->notifier, nb); 250 atomic_notifier_chain_unregister(&x->notifier, nb);
251} 251}
252 252
253/* for OTG controller drivers (and maybe other stuff) */ 253/* for OTG controller drivers (and maybe other stuff) */
diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h
index 9595796d62e..51ebf72bc44 100644
--- a/include/linux/usb/ulpi.h
+++ b/include/linux/usb/ulpi.h
@@ -181,7 +181,7 @@
181 181
182/*-------------------------------------------------------------------------*/ 182/*-------------------------------------------------------------------------*/
183 183
184struct otg_transceiver *otg_ulpi_create(struct otg_io_access_ops *ops, 184struct usb_phy *otg_ulpi_create(struct otg_io_access_ops *ops,
185 unsigned int flags); 185 unsigned int flags);
186 186
187#ifdef CONFIG_USB_ULPI_VIEWPORT 187#ifdef CONFIG_USB_ULPI_VIEWPORT
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 00:21:48 -0400