mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-29 15:43:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-usb

Browse Source 
- Introduce CONFIG_SPL_DM_USB
This commit is contained in:
Tom Rini 2018-11-27 14:01:45 -05:00
commit 67cf22cbde
34 changed files with 117 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile
View File

@ -33,7 +33,7 @@ obj-$(CONFIG_MII) += miiphyutil.o
obj-$(CONFIG_CMD_MII) += miiphyutil.o
obj-$(CONFIG_PHYLIB) += miiphyutil.o
ifdef CONFIG_CMD_USB
ifdef CONFIG_USB
obj-y += usb.o usb_hub.o
obj-$(CONFIG_USB_STORAGE) += usb_storage.o
endif

14
common/usb.c
View File

@ -42,7 +42,7 @@
static int asynch_allowed;
char usb_started; /* flag for the started/stopped USB status */
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
static struct usb_device usb_dev[USB_MAX_DEVICE];
static int dev_index;
@ -183,7 +183,7 @@ int usb_disable_asynch(int disable)
asynch_allowed = !disable;
return old_value;
}
#endif /* !CONFIG_DM_USB */
#endif /* !CONFIG_IS_ENABLED(DM_USB) */
/*-------------------------------------------------------------------
@ -849,7 +849,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
* the USB device are static allocated [USB_MAX_DEVICE].
*/
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* returns a pointer to the device with the index [index].
* if the device is not assigned (dev->devnum==-1) returns NULL
@ -906,7 +906,7 @@ __weak int usb_alloc_device(struct usb_device *udev)
{
return 0;
}
#endif /* !CONFIG_DM_USB */
#endif /* !CONFIG_IS_ENABLED(DM_USB) */
static int usb_hub_port_reset(struct usb_device *dev, struct usb_device *hub)
{
@ -1166,7 +1166,7 @@ int usb_setup_device(struct usb_device *dev, bool do_read,
return ret;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/*
* By the time we get here, the device has gotten a new device ID
* and is in the default state. We need to identify the thing and
@ -1215,14 +1215,14 @@ int board_usb_cleanup(int index, enum usb_init_type init)
bool usb_device_has_child_on_port(struct usb_device *parent, int port)
{
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
return false;
#else
return parent->children[port] != NULL;
#endif
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
void usb_find_usb2_hub_address_port(struct usb_device *udev,
uint8_t *hub_address, uint8_t *hub_port)
{

16
common/usb_hub.c
View File

@ -64,7 +64,7 @@ static inline bool usb_hub_is_superspeed(struct usb_device *hdev)
return hdev->descriptor.bDeviceProtocol == 3;
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
bool usb_hub_is_root_hub(struct udevice *hub)
{
if (device_get_uclass_id(hub->parent) != UCLASS_USB_HUB)
@ -125,7 +125,7 @@ int usb_get_port_status(struct usb_device *dev, int port, void *data)
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
data, sizeof(struct usb_port_status), USB_CNTL_TIMEOUT);
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
if (ret < 0)
return ret;
@ -209,7 +209,7 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
max(100, (int)pgood_delay) + 1000);
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
static struct usb_hub_device hub_dev[USB_MAX_HUB];
static int usb_hub_index;
@ -273,7 +273,7 @@ static int usb_hub_port_reset(struct usb_device *dev, int port,
unsigned short portstatus, portchange;
int delay = HUB_SHORT_RESET_TIME; /* start with short reset delay */
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
debug("%s: resetting '%s' port %d...\n", __func__, dev->dev->name,
port + 1);
#else
@ -394,7 +394,7 @@ int usb_hub_port_connect_change(struct usb_device *dev, int port)
break;
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct udevice *child;
ret = usb_scan_device(dev->dev, port + 1, speed, &child);
@ -604,7 +604,7 @@ static struct usb_hub_device *usb_get_hub_device(struct usb_device *dev)
{
struct usb_hub_device *hub;
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* "allocate" Hub device */
hub = usb_hub_allocate();
#else
@ -788,7 +788,7 @@ static int usb_hub_configure(struct usb_device *dev)
(le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
"" : "no ");
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/*
* Update USB host controller's internal representation of this hub
* after the hub descriptor is fetched.
@ -930,7 +930,7 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
return ret;
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
int usb_hub_scan(struct udevice *hub)
{
struct usb_device *udev = dev_get_parent_priv(hub);

4
common/usb_kbd.c
View File

@ -539,7 +539,7 @@ static int probe_usb_keyboard(struct usb_device *dev)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* Search for keyboard and register it if found. */
int drv_usb_kbd_init(void)
{
@ -602,7 +602,7 @@ int usb_kbd_deregister(int force)
#endif
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int usb_kbd_probe(struct udevice *dev)
{

34
common/usb_storage.c
View File

@ -66,7 +66,7 @@ static __u32 CBWTag;
static int usb_max_devs; /* number of highest available usb device */
#ifndef CONFIG_BLK
#if !CONFIG_IS_ENABLED(BLK)
static struct blk_desc usb_dev_desc[USB_MAX_STOR_DEV];
#endif
@ -99,7 +99,7 @@ struct us_data {
unsigned short max_xfer_blk; /* maximum transfer blocks */
};
#ifndef CONFIG_BLK
#if !CONFIG_IS_ENABLED(BLK)
static struct us_data usb_stor[USB_MAX_STOR_DEV];
#endif
@ -111,7 +111,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *us,
struct blk_desc *dev_desc);
int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,
struct us_data *ss);
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr,
lbaint_t blkcnt, void *buffer);
static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr,
@ -136,7 +136,7 @@ static void usb_show_progress(void)
int usb_stor_info(void)
{
int count = 0;
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
struct udevice *dev;
for (blk_first_device(IF_TYPE_USB, &dev);
@ -186,7 +186,7 @@ static int usb_stor_probe_device(struct usb_device *udev)
{
int lun, max_lun;
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
struct us_data *data;
int ret;
#else
@ -197,7 +197,7 @@ static int usb_stor_probe_device(struct usb_device *udev)
#endif
debug("\n\nProbing for storage\n");
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
/*
* We store the us_data in the mass storage device's platdata. It
* is shared by all LUNs (block devices) attached to this mass storage
@ -299,7 +299,7 @@ int usb_stor_scan(int mode)
if (mode == 1)
printf(" scanning usb for storage devices... ");
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
unsigned char i;
usb_disable_asynch(1); /* asynch transfer not allowed */
@ -942,7 +942,7 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev,
size_t __maybe_unused size;
int __maybe_unused ret;
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
#ifdef CONFIG_USB_EHCI_HCD
/*
* The U-Boot EHCI driver can handle any transfer length as long as
@ -1119,7 +1119,7 @@ static void usb_bin_fixup(struct usb_device_descriptor descriptor,
}
#endif /* CONFIG_USB_BIN_FIXUP */
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr,
lbaint_t blkcnt, void *buffer)
#else
@ -1134,14 +1134,14 @@ static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr,
struct us_data *ss;
int retry;
struct scsi_cmd *srb = &usb_ccb;
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
struct blk_desc *block_dev;
#endif
if (blkcnt == 0)
return 0;
/* Setup device */
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
block_dev = dev_get_uclass_platdata(dev);
udev = dev_get_parent_priv(dev_get_parent(dev));
debug("\nusb_read: udev %d\n", block_dev->devnum);
@ -1200,7 +1200,7 @@ retry_it:
return blkcnt;
}
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr,
lbaint_t blkcnt, const void *buffer)
#else
@ -1215,7 +1215,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
struct us_data *ss;
int retry;
struct scsi_cmd *srb = &usb_ccb;
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
struct blk_desc *block_dev;
#endif
@ -1223,7 +1223,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
return 0;
/* Setup device */
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
block_dev = dev_get_uclass_platdata(dev);
udev = dev_get_parent_priv(dev_get_parent(dev));
debug("\nusb_read: udev %d\n", block_dev->devnum);
@ -1495,7 +1495,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
return 1;
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int usb_mass_storage_probe(struct udevice *dev)
{
@ -1519,7 +1519,7 @@ U_BOOT_DRIVER(usb_mass_storage) = {
.id = UCLASS_MASS_STORAGE,
.of_match = usb_mass_storage_ids,
.probe = usb_mass_storage_probe,
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
.platdata_auto_alloc_size = sizeof(struct us_data),
#endif
};
@ -1540,7 +1540,7 @@ static const struct usb_device_id mass_storage_id_table[] = {
U_BOOT_USB_DEVICE(usb_mass_storage, mass_storage_id_table);
#endif
#ifdef CONFIG_BLK
#if CONFIG_IS_ENABLED(BLK)
static const struct blk_ops usb_storage_ops = {
.read = usb_stor_read,
.write = usb_stor_write,

3
configs/am335x_evm_defconfig
View File

@ -40,15 +40,16 @@ CONFIG_NAND=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_DRIVER_TI_CPSW=y
CONFIG_PHY_GIGE=y
CONFIG_MII=y
CONFIG_DRIVER_TI_CPSW=y
CONFIG_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_TIMER=y
CONFIG_OMAP_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_TI=y

5
drivers/usb/Kconfig
View File

@ -47,6 +47,11 @@ config DM_USB
declared with the U_BOOT_USB_DEVICE() macro and will be
automatically probed when found on the bus.
config SPL_DM_USB
bool "Enable driver model for USB in SPL"
depends on DM_USB
default y
source "drivers/usb/host/Kconfig"
source "drivers/usb/dwc3/Kconfig"

2
drivers/usb/common/Makefile
View File

@ -3,6 +3,6 @@
# (C) Copyright 2016 Freescale Semiconductor, Inc.
#
obj-$(CONFIG_DM_USB) += common.o
obj-$(CONFIG_$(SPL_)DM_USB) += common.o
obj-$(CONFIG_USB_EHCI_FSL) += fsl-dt-fixup.o fsl-errata.o
obj-$(CONFIG_USB_XHCI_FSL) += fsl-dt-fixup.o fsl-errata.o

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

@ -789,7 +789,7 @@ MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
int dwc3_init(struct dwc3 *dwc)
{

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

@ -712,7 +712,7 @@ struct dwc3 {
/* device lock */
spinlock_t lock;
#if defined(__UBOOT__) && defined(CONFIG_DM_USB)
#if defined(__UBOOT__) && CONFIG_IS_ENABLED(DM_USB)
struct udevice *dev;
#else
struct device *dev;

2
drivers/usb/eth/usb_ether.c
View File

@ -271,7 +271,7 @@ int usb_host_eth_scan(int mode)
}
usb_max_eth_dev = 0;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/*
* TODO: We should add U_BOOT_USB_DEVICE() declarations to each USB
* Ethernet driver and then most of this file can be removed.

2
drivers/usb/gadget/ci_udc.c
View File

@ -1015,7 +1015,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
if (driver->speed != USB_SPEED_FULL && driver->speed != USB_SPEED_HIGH)
return -EINVAL;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
ret = usb_setup_ehci_gadget(&controller.ctrl);
#else
ret = usb_lowlevel_init(0, USB_INIT_DEVICE, (void **)&controller.ctrl);

8
drivers/usb/gadget/ether.c
View File

@ -100,7 +100,7 @@ struct eth_dev {
struct usb_gadget *gadget;
struct usb_request *req; /* for control responses */
struct usb_request *stat_req; /* for cdc & rndis status */
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct udevice *usb_udev;
#endif
@ -2337,7 +2337,7 @@ fail:
/*-------------------------------------------------------------------------*/
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
int dm_usb_init(struct eth_dev *e_dev)
{
struct udevice *dev = NULL;
@ -2362,7 +2362,7 @@ static int _usb_eth_init(struct ether_priv *priv)
unsigned long ts;
unsigned long timeout = USB_CONNECT_TIMEOUT;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
if (dm_usb_init(dev)) {
pr_err("USB ether not found\n");
return -ENODEV;
@ -2541,7 +2541,7 @@ void _usb_eth_halt(struct ether_priv *priv)
}
usb_gadget_unregister_driver(&priv->eth_driver);
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
board_usb_cleanup(0, USB_INIT_DEVICE);
#endif
}

4
drivers/usb/host/Makefile
View File

@ -3,8 +3,8 @@
# (C) Copyright 2000-2007
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
ifdef CONFIG_DM_USB
obj-$(CONFIG_CMD_USB) += usb-uclass.o
ifdef CONFIG_$(SPL_)DM_USB
obj-y += usb-uclass.o
obj-$(CONFIG_SANDBOX) += usb-sandbox.o
endif

12
drivers/usb/host/dwc2.c
View File

@ -29,7 +29,7 @@
#define MAX_ENDPOINT 16
struct dwc2_priv {
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
uint8_t aligned_buffer[DWC2_DATA_BUF_SIZE] __aligned(ARCH_DMA_MINALIGN);
uint8_t status_buffer[DWC2_STATUS_BUF_SIZE] __aligned(ARCH_DMA_MINALIGN);
#ifdef CONFIG_DM_REGULATOR
@ -54,7 +54,7 @@ struct dwc2_priv {
struct reset_ctl_bulk resets;
};
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* We need cacheline-aligned buffers for DMA transfers and dcache support */
DEFINE_ALIGN_BUFFER(uint8_t, aligned_buffer_addr, DWC2_DATA_BUF_SIZE,
ARCH_DMA_MINALIGN);
@ -168,7 +168,7 @@ static void dwc_otg_core_reset(struct dwc2_core_regs *regs)
mdelay(100);
}
#if defined(CONFIG_DM_USB) && defined(CONFIG_DM_REGULATOR)
#if CONFIG_IS_ENABLED(DM_USB) && defined(CONFIG_DM_REGULATOR)
static int dwc_vbus_supply_init(struct udevice *dev)
{
struct dwc2_priv *priv = dev_get_priv(dev);
@ -211,7 +211,7 @@ static int dwc_vbus_supply_init(struct udevice *dev)
return 0;
}
#if defined(CONFIG_DM_USB)
#if CONFIG_IS_ENABLED(DM_USB)
static int dwc_vbus_supply_exit(struct udevice *dev)
{
return 0;
@ -1222,7 +1222,7 @@ static void dwc2_uninit_common(struct dwc2_core_regs *regs)
DWC2_HPRT0_PRTRST);
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
int len, struct devrequest *setup)
{
@ -1267,7 +1267,7 @@ int usb_lowlevel_stop(int index)
}
#endif
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int dwc2_submit_control_msg(struct udevice *dev, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,
struct devrequest *setup)

2
drivers/usb/host/ehci-atmel.c
View File

@ -14,7 +14,7 @@
#include "ehci.h"
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)

12
drivers/usb/host/ehci-fsl.c
View File

@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct ehci_fsl_priv {
struct ehci_ctrl ehci;
fdt_addr_t hcd_base;
@ -34,7 +34,7 @@ struct ehci_fsl_priv {
#endif
static void set_txfifothresh(struct usb_ehci *, u32);
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ehci_fsl_init(struct ehci_fsl_priv *priv, struct usb_ehci *ehci,
struct ehci_hccr *hccr, struct ehci_hcor *hcor);
#else
@ -54,7 +54,7 @@ static int usb_phy_clk_valid(struct usb_ehci *ehci)
}
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ehci_fsl_ofdata_to_platdata(struct udevice *dev)
{
struct ehci_fsl_priv *priv = dev_get_priv(dev);
@ -183,7 +183,7 @@ int ehci_hcd_stop(int index)
}
#endif
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ehci_fsl_init(struct ehci_fsl_priv *priv, struct usb_ehci *ehci,
struct ehci_hccr *hccr, struct ehci_hcor *hcor)
#else
@ -192,7 +192,7 @@ static int ehci_fsl_init(int index, struct usb_ehci *ehci,
#endif
{
const char *phy_type = NULL;
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
size_t len;
char current_usb_controller[5];
#endif
@ -218,7 +218,7 @@ static int ehci_fsl_init(int index, struct usb_ehci *ehci,
out_be32(&ehci->snoop2, 0x80000000 | SNOOP_SIZE_2GB);
/* Init phy */
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
if (priv->phy_type)
phy_type = priv->phy_type;
#else

12
drivers/usb/host/ehci-hcd.c
View File

@ -30,7 +30,7 @@
*/
#define HCHALT_TIMEOUT (8 * 1000)
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
static struct ehci_ctrl ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT];
#endif
@ -111,7 +111,7 @@ static struct descriptor {
static struct ehci_ctrl *ehci_get_ctrl(struct usb_device *udev)
{
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
return dev_get_priv(usb_get_bus(udev->dev));
#else
return udev->controller;
@ -973,7 +973,7 @@ static void ehci_setup_ops(struct ehci_ctrl *ctrl, const struct ehci_ops *ops)
}
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
void ehci_set_controller_priv(int index, void *priv, const struct ehci_ops *ops)
{
struct ehci_ctrl *ctrl = &ehcic[index];
@ -1097,7 +1097,7 @@ static int ehci_common_init(struct ehci_ctrl *ctrl, uint tweaks)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int usb_lowlevel_stop(int index)
{
ehci_shutdown(&ehcic[index]);
@ -1518,7 +1518,7 @@ static int _ehci_submit_int_msg(struct usb_device *dev, unsigned long pipe,
return result;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,
void *buffer, int length)
{
@ -1556,7 +1556,7 @@ int destroy_int_queue(struct usb_device *dev, struct int_queue *queue)
}
#endif
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ehci_submit_control_msg(struct udevice *dev, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,
struct devrequest *setup)

4
drivers/usb/host/ehci-marvell.c
View File

@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
/*
* USB 2.0 Bridge Address Decoding registers setup
*/
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct ehci_mvebu_priv {
struct ehci_ctrl ehci;
@ -228,4 +228,4 @@ int ehci_hcd_stop(int index)
return 0;
}
#endif /* CONFIG_DM_USB */
#endif /* CONFIG_IS_ENABLED(DM_USB) */

2
drivers/usb/host/ehci-mx6.c
View File

@ -335,7 +335,7 @@ int ehci_mx6_common_init(struct usb_ehci *ehci, int index)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{

8
drivers/usb/host/ehci-pci.c
View File

@ -19,7 +19,7 @@ struct ehci_pci_priv {
struct phy phy;
};
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr,
struct ehci_hcor **ret_hcor)
{
@ -121,9 +121,9 @@ int ehci_hcd_stop(int index)
{
return 0;
}
#endif /* nCONFIG_DM_USB */
#endif /* !CONFIG_IS_ENABLED(DM_USB) */
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ehci_pci_probe(struct udevice *dev)
{
struct ehci_hccr *hccr;
@ -173,4 +173,4 @@ static struct pci_device_id ehci_pci_supported[] = {
U_BOOT_PCI_DEVICE(ehci_pci, ehci_pci_supported);
#endif /* CONFIG_DM_USB */
#endif /* CONFIG_IS_ENABLED(DM_USB) */

2
drivers/usb/host/ehci-vf.c
View File

@ -153,7 +153,7 @@ int ehci_vf_common_init(struct usb_ehci *ehci, int index)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{

10
drivers/usb/host/ohci-hcd.c
View File

@ -120,7 +120,7 @@ static struct pci_device_id ehci_pci_ids[] = {
#define invalidate_dcache_iso_td(addr) invalidate_dcache_buffer(addr, 32)
#define invalidate_dcache_hcca(addr) invalidate_dcache_buffer(addr, 256)
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/*
* The various ohci_mdelay(1) calls in the code seem unnecessary. We keep
* them around when building for older boards not yet converted to the dm
@ -131,7 +131,7 @@ static struct pci_device_id ehci_pci_ids[] = {
#define ohci_mdelay(x) mdelay(x)
#endif
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* global ohci_t */
static ohci_t gohci;
/* this must be aligned to a 256 byte boundary */
@ -1691,7 +1691,7 @@ static int _ohci_destroy_int_queue(ohci_t *ohci, struct usb_device *dev,
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* submit routines called from usb.c */
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
int transfer_len)
@ -1980,7 +1980,7 @@ static int hc_interrupt(ohci_t *ohci)
/*-------------------------------------------------------------------------*/
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/*-------------------------------------------------------------------------*/
@ -2130,7 +2130,7 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe,
}
#endif
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int ohci_submit_control_msg(struct udevice *dev, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,
struct devrequest *setup)

4
drivers/usb/host/ohci.h
View File

@ -27,7 +27,7 @@
#define ED_ALIGNMENT 16
#endif
#if defined CONFIG_DM_USB && ARCH_DMA_MINALIGN > 32
#if CONFIG_IS_ENABLED(DM_USB) && ARCH_DMA_MINALIGN > 32
#define TD_ALIGNMENT ARCH_DMA_MINALIGN
#else
#define TD_ALIGNMENT 32
@ -406,7 +406,7 @@ typedef struct ohci {
const char *slot_name;
} ohci_t;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
extern struct dm_usb_ops ohci_usb_ops;
int ohci_register(struct udevice *dev, struct ohci_regs *regs);

2
drivers/usb/host/xhci-dwc3.c
View File

@ -109,7 +109,7 @@ void dwc3_set_fladj(struct dwc3 *dwc3_reg, u32 val)
GFLADJ_30MHZ(val));
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int xhci_dwc3_setup_phy(struct udevice *dev)
{
struct xhci_dwc3_platdata *plat = dev_get_platdata(dev);

4
drivers/usb/host/xhci-fsl.c
View File

@ -19,7 +19,7 @@
#include <dm.h>
/* Declare global data pointer */
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
static struct fsl_xhci fsl_xhci;
unsigned long ctr_addr[] = FSL_USB_XHCI_ADDR;
#else
@ -107,7 +107,7 @@ static int fsl_xhci_core_exit(struct fsl_xhci *fsl_xhci)
return 0;
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int xhci_fsl_probe(struct udevice *dev)
{
struct xhci_fsl_priv *priv = dev_get_priv(dev);

6
drivers/usb/host/xhci-mem.c
View File

@ -723,7 +723,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
int slot_id = udev->slot_id;
int speed = udev->speed;
int route = 0;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct usb_device *dev = udev;
struct usb_hub_device *hub;
#endif
@ -739,7 +739,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
/* Only the control endpoint is valid - one endpoint context */
slot_ctx->dev_info |= cpu_to_le32(LAST_CTX(1));
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/* Calculate the route string for this device */
port_num = dev->portnr;
while (!usb_hub_is_root_hub(dev->dev)) {
@ -782,7 +782,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
BUG();
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/* Set up TT fields to support FS/LS devices */
if (speed == USB_SPEED_LOW || speed == USB_SPEED_FULL) {
struct udevice *parent = udev->dev;

12
drivers/usb/host/xhci.c
View File

@ -108,13 +108,13 @@ static struct descriptor {
},
};
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
static struct xhci_ctrl xhcic[CONFIG_USB_MAX_CONTROLLER_COUNT];
#endif
struct xhci_ctrl *xhci_get_ctrl(struct usb_device *udev)
{
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct udevice *dev;
/* Find the USB controller */
@ -741,7 +741,7 @@ static int _xhci_alloc_device(struct usb_device *udev)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int usb_alloc_device(struct usb_device *udev)
{
return _xhci_alloc_device(udev);
@ -1256,7 +1256,7 @@ static int xhci_lowlevel_stop(struct xhci_ctrl *ctrl)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int submit_control_msg(struct usb_device *udev, unsigned long pipe,
void *buffer, int length, struct devrequest *setup)
{
@ -1340,9 +1340,9 @@ int usb_lowlevel_stop(int index)
return 0;
}
#endif /* CONFIG_DM_USB */
#endif /* CONFIG_IS_ENABLED(DM_USB) */
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int xhci_submit_control_msg(struct udevice *dev, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,

2
drivers/usb/host/xhci.h
View File

@ -1211,7 +1211,7 @@ void xhci_hcd_stop(int index);
#define XHCI_STS_CNR (1 << 11)
struct xhci_ctrl {
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct udevice *dev;
#endif
struct xhci_hccr *hccr; /* R/O registers, not need for volatile */

12
drivers/usb/musb-new/musb_uboot.c
View File

@ -19,7 +19,7 @@ struct int_queue {
struct urb urb;
};
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
struct musb_host_data musb_host;
#endif
@ -243,7 +243,7 @@ int musb_lowlevel_init(struct musb_host_data *host)
return 0;
}
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
int usb_lowlevel_stop(int index)
{
if (!musb_host.host) {
@ -300,9 +300,9 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{
return musb_lowlevel_init(&musb_host);
}
#endif /* !CONFIG_DM_USB */
#endif /* !CONFIG_IS_ENABLED(DM_USB) */
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static int musb_submit_control_msg(struct udevice *dev, struct usb_device *udev,
unsigned long pipe, void *buffer, int length,
struct devrequest *setup)
@ -364,7 +364,7 @@ struct dm_usb_ops musb_usb_ops = {
.destroy_int_queue = musb_destroy_int_queue,
.reset_root_port = musb_reset_root_port,
};
#endif /* CONFIG_DM_USB */
#endif /* CONFIG_IS_ENABLED(DM_USB) */
#endif /* CONFIG_USB_MUSB_HOST */
#ifdef CONFIG_USB_MUSB_GADGET
@ -425,7 +425,7 @@ struct musb *musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
struct musb **musbp;
switch (plat->mode) {
#if defined(CONFIG_USB_MUSB_HOST) && !defined(CONFIG_DM_USB)
#if defined(CONFIG_USB_MUSB_HOST) && !CONFIG_IS_ENABLED(DM_USB)
case MUSB_HOST:
musbp = &musb_host.host;
break;

4
drivers/usb/musb-new/omap2430.c
View File

@ -135,7 +135,7 @@ const struct musb_platform_ops omap2430_ops = {
.disable = omap2430_musb_disable,
};
#if defined(CONFIG_DM_USB)
#if CONFIG_IS_ENABLED(DM_USB)
struct omap2430_musb_platdata {
void *base;
@ -276,4 +276,4 @@ U_BOOT_DRIVER(omap2430_musb) = {
.priv_auto_alloc_size = sizeof(struct musb_host_data),
};
#endif /* CONFIG_DM_USB */
#endif /* CONFIG_IS_ENABLED(DM_USB) */

4
drivers/usb/musb-new/ti-musb.c
View File

@ -19,7 +19,7 @@
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/* USB 2.0 PHY Control */
#define CM_PHY_PWRDN (1 << 0)
@ -251,4 +251,4 @@ U_BOOT_DRIVER(ti_musb_wrapper) = {
.bind = ti_musb_wrapper_bind,
};
#endif /* CONFIG_DM_USB */
#endif /* CONFIG_IS_ENABLED(DM_USB) */

2
drivers/usb/musb-new/usb-compat.h
View File

@ -67,7 +67,7 @@ static inline int usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd,
return 0;
}
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
static inline struct usb_device *usb_dev_get_parent(struct usb_device *udev)
{
struct udevice *parent = udev->dev->parent;

12
include/usb.h
View File

@ -140,7 +140,7 @@ struct usb_device {
int act_len; /* transferred bytes */
int maxchild; /* Number of ports if hub */
int portnr; /* Port number, 1=first */
#ifndef CONFIG_DM_USB
#if !CONFIG_IS_ENABLED(DM_USB)
/* parent hub, or NULL if this is the root hub */
struct usb_device *parent;
struct usb_device *children[USB_MAXCHILDREN];
@ -148,7 +148,7 @@ struct usb_device {
#endif
/* slot_id - for xHCI enabled devices */
unsigned int slot_id;
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
struct udevice *dev; /* Pointer to associated device */
struct udevice *controller_dev; /* Pointer to associated controller */
#endif
@ -173,7 +173,7 @@ enum usb_init_type {
int usb_lowlevel_init(int index, enum usb_init_type init, void **controller);
int usb_lowlevel_stop(int index);
#if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_DM_USB)
#if defined(CONFIG_USB_MUSB_HOST) || CONFIG_IS_ENABLED(DM_USB)
int usb_reset_root_port(struct usb_device *dev);
#else
#define usb_reset_root_port(dev)
@ -187,7 +187,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
int transfer_len, int interval);
#if defined CONFIG_USB_EHCI_HCD || defined CONFIG_USB_MUSB_HOST \
|| defined(CONFIG_DM_USB)
|| CONFIG_IS_ENABLED(DM_USB)
struct int_queue *create_int_queue(struct usb_device *dev, unsigned long pipe,
int queuesize, int elementsize, void *buffer, int interval);
int destroy_int_queue(struct usb_device *dev, struct int_queue *queue);
@ -588,7 +588,7 @@ struct usb_hub_device {
struct usb_tt tt; /* Transaction Translator */
};
#ifdef CONFIG_DM_USB
#if CONFIG_IS_ENABLED(DM_USB)
/**
* struct usb_platdata - Platform data about a USB controller
*
@ -912,7 +912,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp);
*/
void usb_stor_reset(void);
#else /* !CONFIG_DM_USB */
#else /* !CONFIG_IS_ENABLED(DM_USB) */
struct usb_device *usb_get_dev_index(int index);