mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
Merge git://git.denx.de/u-boot-usb
This commit is contained in:
@ -16,6 +16,7 @@
|
||||
#include <asm/arch/sys_proto.h>
|
||||
#include "../common/common.h"
|
||||
#include "../common/eeprom.h"
|
||||
#include <asm/omap_common.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
@ -64,3 +65,15 @@ u32 get_board_rev(void)
|
||||
{
|
||||
return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
|
||||
}
|
||||
|
||||
int board_usb_init(int index, enum usb_init_type init)
|
||||
{
|
||||
enable_usb_clocks(index);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int board_usb_cleanup(int index, enum usb_init_type init)
|
||||
{
|
||||
disable_usb_clocks(index);
|
||||
return 0;
|
||||
}
|
||||
|
@ -14,6 +14,8 @@
|
||||
#include <power/pmic.h>
|
||||
#include <power/tps65218.h>
|
||||
#include "board.h"
|
||||
#include <usb.h>
|
||||
#include <asm/omap_common.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
@ -50,6 +52,18 @@ int board_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int board_usb_init(int index, enum usb_init_type init)
|
||||
{
|
||||
enable_usb_clocks(index);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int board_usb_cleanup(int index, enum usb_init_type init)
|
||||
{
|
||||
disable_usb_clocks(index);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DRIVER_TI_CPSW
|
||||
|
||||
static void cpsw_control(int enabled)
|
||||
|
@ -687,7 +687,7 @@ int usb_gadget_handle_interrupts(int index)
|
||||
#endif /* CONFIG_USB_DWC3 */
|
||||
|
||||
#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)
|
||||
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
|
||||
int board_usb_init(int index, enum usb_init_type init)
|
||||
{
|
||||
enable_usb_clocks(index);
|
||||
#ifdef CONFIG_USB_DWC3
|
||||
@ -718,7 +718,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
|
||||
int board_usb_cleanup(int index, enum usb_init_type init)
|
||||
{
|
||||
#ifdef CONFIG_USB_DWC3
|
||||
switch (index) {
|
||||
|
@ -867,7 +867,7 @@ int usb_gadget_handle_interrupts(int index)
|
||||
#endif /* CONFIG_USB_DWC3 */
|
||||
|
||||
#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)
|
||||
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
|
||||
int board_usb_init(int index, enum usb_init_type init)
|
||||
{
|
||||
enable_usb_clocks(index);
|
||||
switch (index) {
|
||||
@ -901,7 +901,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
|
||||
int board_usb_cleanup(int index, enum usb_init_type init)
|
||||
{
|
||||
#ifdef CONFIG_USB_DWC3
|
||||
switch (index) {
|
||||
|
@ -907,7 +907,7 @@ static struct ti_usb_phy_device usb_phy2_device = {
|
||||
.index = 1,
|
||||
};
|
||||
|
||||
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
|
||||
int board_usb_init(int index, enum usb_init_type init)
|
||||
{
|
||||
enable_usb_clocks(index);
|
||||
switch (index) {
|
||||
@ -944,7 +944,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
|
||||
int board_usb_cleanup(int index, enum usb_init_type init)
|
||||
{
|
||||
switch (index) {
|
||||
case 0:
|
||||
|
Reference in New Issue
Block a user