leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwc3: core: add support for multiple dwc3 controllers

Browse Source 
Added support for multiple dwc3 controllers. This gives uboot
the capability to control multiple dwc3 controllers.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
This commit is contained in:
Kishon Vijay Abraham I 2015-02-23 18:40:05 +05:30 committed by Marek Vasut
parent 8e1906a81f
commit 793d347f53
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/dwc3/core.c
View File

@ -29,7 +29,7 @@
#include "linux-compat.h" #include "linux-compat.h"
struct dwc3 *dwc; static LIST_HEAD(dwc3_list);
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
void dwc3_set_mode(struct dwc3 *dwc, u32 mode) void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
@ -612,6 +612,7 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
*/ */
int dwc3_uboot_init(struct dwc3_device *dwc3_dev) int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
{ {
struct dwc3 *dwc;
struct device *dev; struct device *dev;
u8 lpm_nyet_threshold; u8 lpm_nyet_threshold;
u8 tx_de_emphasis; u8 tx_de_emphasis;
@ -678,6 +679,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
dwc->hird_threshold = hird_threshold dwc->hird_threshold = hird_threshold
| (dwc->is_utmi_l1_suspend << 4); | (dwc->is_utmi_l1_suspend << 4);
dwc->index = dwc3_dev->index;
dwc3_cache_hwparams(dwc); dwc3_cache_hwparams(dwc);
ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE); ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
@ -710,6 +713,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
if (ret) if (ret)
goto err2; goto err2;
list_add_tail(&dwc->list, &dwc3_list);
return 0; return 0;
err2: err2:
@ -729,17 +734,28 @@ err0:
* @index: index of this controller * @index: index of this controller
* *
* Performs cleanup of memory allocated in dwc3_uboot_init and other misc * Performs cleanup of memory allocated in dwc3_uboot_init and other misc
* cleanups (equivalent to dwc3_remove in linux). * cleanups (equivalent to dwc3_remove in linux). index of _this_ controller
* should be passed and should match with the index passed in
* dwc3_device during init.
* *
* Generally called from board file. * Generally called from board file.
*/ */
void dwc3_uboot_exit() void dwc3_uboot_exit(int index)
{ {
dwc3_core_exit_mode(dwc); struct dwc3 *dwc;
dwc3_event_buffers_cleanup(dwc);
dwc3_free_event_buffers(dwc); list_for_each_entry(dwc, &dwc3_list, list) {
dwc3_core_exit(dwc); if (dwc->index != index)
kfree(dwc->mem); continue;
dwc3_core_exit_mode(dwc);
dwc3_event_buffers_cleanup(dwc);
dwc3_free_event_buffers(dwc);
dwc3_core_exit(dwc);
list_del(&dwc->list);
kfree(dwc->mem);
break;
}
} }
MODULE_ALIAS("platform:dwc3"); MODULE_ALIAS("platform:dwc3");

4
drivers/usb/dwc3/core.h
View File

@ -695,6 +695,8 @@ struct dwc3_scratchpad_array {
* 1 - -3.5dB de-emphasis * 1 - -3.5dB de-emphasis
* 2 - No de-emphasis * 2 - No de-emphasis
* 3 - Reserved * 3 - Reserved
* @index: index of _this_ controller
* @list: to maintain the list of dwc3 controllers
*/ */
struct dwc3 { struct dwc3 {
struct usb_ctrlrequest *ctrl_req; struct usb_ctrlrequest *ctrl_req;
@ -811,6 +813,8 @@ struct dwc3 {
unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis_quirk:1;
unsigned tx_de_emphasis:2; unsigned tx_de_emphasis:2;
int index;
struct list_head list;
}; };
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */

3
include/dwc3-uboot.h
View File

@ -33,8 +33,9 @@ struct dwc3_device {
unsigned dis_u2_susphy_quirk; unsigned dis_u2_susphy_quirk;
unsigned tx_de_emphasis_quirk; unsigned tx_de_emphasis_quirk;
unsigned tx_de_emphasis; unsigned tx_de_emphasis;
int index;
}; };
int dwc3_uboot_init(struct dwc3_device *dev); int dwc3_uboot_init(struct dwc3_device *dev);
void dwc3_uboot_exit(void); void dwc3_uboot_exit(int index);
#endif /* __DWC3_UBOOT_H_ */ #endif /* __DWC3_UBOOT_H_ */