aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/otg')
-rw-r--r--drivers/usb/otg/gpio_vbus.c1
-rw-r--r--drivers/usb/otg/isp1301_omap.c2
-rw-r--r--drivers/usb/otg/otg.c1
-rw-r--r--drivers/usb/otg/twl6030-usb.c16
-rw-r--r--drivers/usb/otg/ulpi.c1
5 files changed, 4 insertions, 17 deletions
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index 52733d9959b4..fb644c107ded 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -11,6 +11,7 @@
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/platform_device.h> 12#include <linux/platform_device.h>
13#include <linux/gpio.h> 13#include <linux/gpio.h>
14#include <linux/module.h>
14#include <linux/slab.h> 15#include <linux/slab.h>
15#include <linux/interrupt.h> 16#include <linux/interrupt.h>
16#include <linux/usb.h> 17#include <linux/usb.h>
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index ca9b690a7e40..8c86787c2f09 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -899,7 +899,7 @@ static int otg_bind(struct isp1301 *isp)
899 899
900 if (otg_dev) 900 if (otg_dev)
901 status = request_irq(otg_dev->resource[1].start, omap_otg_irq, 901 status = request_irq(otg_dev->resource[1].start, omap_otg_irq,
902 IRQF_DISABLED, DRIVER_NAME, isp); 902 0, DRIVER_NAME, isp);
903 else 903 else
904 status = -ENODEV; 904 status = -ENODEV;
905 905
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index fb7adeff9ffa..307c27bc51eb 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -10,6 +10,7 @@
10 */ 10 */
11 11
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/export.h>
13#include <linux/device.h> 14#include <linux/device.h>
14 15
15#include <linux/usb/otg.h> 16#include <linux/usb/otg.h>
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index b4d2c0972b3d..ed2b26cfe814 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -137,22 +137,6 @@ static inline u8 twl6030_readb(struct twl6030_usb *twl, u8 module, u8 address)
137 return ret; 137 return ret;
138} 138}
139 139
140/*-------------------------------------------------------------------------*/
141static int twl6030_set_phy_clk(struct otg_transceiver *x, int on)
142{
143 struct twl6030_usb *twl;
144 struct device *dev;
145 struct twl4030_usb_data *pdata;
146
147 twl = xceiv_to_twl(x);
148 dev = twl->dev;
149 pdata = dev->platform_data;
150
151 pdata->phy_set_clock(twl->dev, on);
152
153 return 0;
154}
155
156static int twl6030_phy_init(struct otg_transceiver *x) 140static int twl6030_phy_init(struct otg_transceiver *x)
157{ 141{
158 struct twl6030_usb *twl; 142 struct twl6030_usb *twl;
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 770d799d5afb..0b0466728fdc 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -25,6 +25,7 @@
25 25
26#include <linux/kernel.h> 26#include <linux/kernel.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/export.h>
28#include <linux/usb.h> 29#include <linux/usb.h>
29#include <linux/usb/otg.h> 30#include <linux/usb/otg.h>
30#include <linux/usb/ulpi.h> 31#include <linux/usb/ulpi.h>