Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / include / dm / uclass-id.h

diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 967efec8c4bc7cafa5f3a0e54703db2fd2042488..fddfd35f1fbefbcb736b3835b87fc32fc5e096a6 100644 (file)
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -21,6 +21,7 @@ enum uclass_id {
        UCLASS_SPI_EMUL,        /* sandbox SPI device emulator */
        UCLASS_I2C_EMUL,        /* sandbox I2C device emulator */
        UCLASS_PCI_EMUL,        /* sandbox PCI device emulator */
+       UCLASS_USB_EMUL,        /* sandbox USB bus device emulator */
        UCLASS_SIMPLE_BUS,
 
        /* U-Boot uclasses start here */
@@ -42,6 +43,8 @@ enum uclass_id {
        UCLASS_LPC,             /* x86 'low pin count' interface */
        UCLASS_USB,             /* USB bus */
        UCLASS_USB_HUB,         /* USB hub */
+       UCLASS_USB_DEV_GENERIC, /* USB generic device */
+       UCLASS_MASS_STORAGE,    /* Mass storage device */
 
        UCLASS_COUNT,
        UCLASS_INVALID = -1,