diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-23 20:50:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-23 20:50:11 -0500 |
| commit | 9a0cbae22a613dfd55e15565785749b74c19fdf0 (patch) | |
| tree | e66f4ce35ba9d7ce812b95b8b441fc0bec917a4f /include | |
| parent | c8f2fe4e670c91172540ab36700d7a8411fc6f76 (diff) | |
| parent | 8019d32c4701b95410113541deb7f28d5c2b02a5 (diff) | |
| download | u-boot-9a0cbae22a613dfd55e15565785749b74c19fdf0.tar.gz u-boot-9a0cbae22a613dfd55e15565785749b74c19fdf0.tar.xz u-boot-9a0cbae22a613dfd55e15565785749b74c19fdf0.zip | |
Merge tag 'u-boot-rockchip-20191124' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Clean vid/pid in Kconfig and add fastboot for rk3399
- add 'u-boot, spl-fifo-mode' for mmc
- Use FIT generator for rk3229 optee and rk3368 ATF
- fan53555: add support for Silergy SYR82X and SYR83X
Diffstat (limited to 'include')
| -rw-r--r-- | include/dwc3-uboot.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/phy.h | 19 | ||||
| -rw-r--r-- | include/power/fan53555.h | 14 |
3 files changed, 35 insertions, 0 deletions
diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h index 9941cc37a3..3c9e204cf0 100644 --- a/include/dwc3-uboot.h +++ b/include/dwc3-uboot.h @@ -10,10 +10,12 @@ #define __DWC3_UBOOT_H_ #include <linux/usb/otg.h> +#include <linux/usb/phy.h> struct dwc3_device { unsigned long base; enum usb_dr_mode dr_mode; + enum usb_phy_interface hsphy_mode; u32 maximum_speed; unsigned tx_fifo_resize:1; unsigned has_lpm_erratum; diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h new file mode 100644 index 0000000000..158ca9cd85 --- /dev/null +++ b/include/linux/usb/phy.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * USB PHY defines + * + * These APIs may be used between USB controllers. USB device drivers + * (for either host or peripheral roles) don't use these calls; they + * continue to use just usb_device and usb_gadget. + */ + +#ifndef __LINUX_USB_PHY_H +#define __LINUX_USB_PHY_H + +enum usb_phy_interface { + USBPHY_INTERFACE_MODE_UNKNOWN, + USBPHY_INTERFACE_MODE_UTMI, + USBPHY_INTERFACE_MODE_UTMIW, +}; + +#endif /* __LINUX_USB_PHY_H */ diff --git a/include/power/fan53555.h b/include/power/fan53555.h new file mode 100644 index 0000000000..c039f06071 --- /dev/null +++ b/include/power/fan53555.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Vasily Khoruzhick <anarsoul@gmail.com> + */ + +#ifndef _FAN53555_H_ +#define _FAN53555_H_ + +enum fan53555_vendor { + FAN53555_VENDOR_FAIRCHILD, + FAN53555_VENDOR_SILERGY, +}; + +#endif |