diff options
author | Neil Zhang <zhangwm@marvell.com> | 2011-10-12 04:49:24 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-10-13 13:41:56 -0400 |
commit | dde34cc5019b51088c18ca789d4b1a20cf9bc617 (patch) | |
tree | 8d9032db3b0ed2a21364c073cd327c46665c383c /include/linux/platform_data | |
parent | 8a9775ab71218690ac34bed9e237e2b968857d3a (diff) |
usb: gadget: mv_udc: refine the driver structure
This patch do the following things:
1. Add header and Copyright for marvell usb driver.
2. Add mv_usb.h in include/linux/platform_data, make the driver
fits all the marvell platform using the same ChipIdea usb ip.
3. Some SOC may has mutiple clock sources, so let me define it
in mv_usb_platform_data and give two helper functions named
udc_clock_enable/udc_clock_disable to deal with the clocks.
4. Different SOCs will have some difference in PHY initialization,
so we will remove file mv_udc_phy.c and add two funtions in
mv_usb_platform_data, let the platform relative driver to realize it.
5. Rewrite probe function according to the modification list above. Find
it will kernel panic when probe failed. The root cause is as follows:
When probe failed, the error handle may call device_unregister()
which in return will call gadget_release.In current code,
gadget_release have two issues:
1: the_controller is a NULL pointer.
2: if we free udc here, then the following code in probe
will access NULL pointer.
Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r-- | include/linux/platform_data/mv_usb.h | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h new file mode 100644 index 000000000000..e9d9149ddf38 --- /dev/null +++ b/include/linux/platform_data/mv_usb.h | |||
@@ -0,0 +1,50 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 Marvell International Ltd. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms of the GNU General Public License as published by the | ||
6 | * Free Software Foundation; either version 2 of the License, or (at your | ||
7 | * option) any later version. | ||
8 | */ | ||
9 | |||
10 | #ifndef __MV_PLATFORM_USB_H | ||
11 | #define __MV_PLATFORM_USB_H | ||
12 | |||
13 | enum pxa_ehci_type { | ||
14 | EHCI_UNDEFINED = 0, | ||
15 | PXA_U2OEHCI, /* pxa 168, 9xx */ | ||
16 | PXA_SPH, /* pxa 168, 9xx SPH */ | ||
17 | MMP3_HSIC, /* mmp3 hsic */ | ||
18 | MMP3_FSIC, /* mmp3 fsic */ | ||
19 | }; | ||
20 | |||
21 | enum { | ||
22 | MV_USB_MODE_OTG, | ||
23 | MV_USB_MODE_HOST, | ||
24 | }; | ||
25 | |||
26 | enum { | ||
27 | VBUS_LOW = 0, | ||
28 | VBUS_HIGH = 1 << 0, | ||
29 | }; | ||
30 | |||
31 | struct mv_usb_addon_irq { | ||
32 | unsigned int irq; | ||
33 | int (*poll)(void); | ||
34 | }; | ||
35 | |||
36 | struct mv_usb_platform_data { | ||
37 | unsigned int clknum; | ||
38 | char **clkname; | ||
39 | struct mv_usb_addon_irq *id; /* Only valid for OTG. ID pin change*/ | ||
40 | struct mv_usb_addon_irq *vbus; /* valid for OTG/UDC. VBUS change*/ | ||
41 | |||
42 | /* only valid for HCD. OTG or Host only*/ | ||
43 | unsigned int mode; | ||
44 | |||
45 | int (*phy_init)(unsigned int regbase); | ||
46 | void (*phy_deinit)(unsigned int regbase); | ||
47 | int (*set_vbus)(unsigned int vbus); | ||
48 | }; | ||
49 | |||
50 | #endif | ||