diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-07-15 16:32:41 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-07-15 16:32:41 +0300 |
| commit | 55192fb3c2355a8251ab3adb8043c57f0ad010fa (patch) | |
| tree | 88ba6ca88a844f4999f7888943b01501b62d1b12 /include/linux/usb | |
| parent | 0560b5b704924e23c52772cc83c7b9e74537fb5f (diff) | |
| parent | 82ffbc138a1fc9076f55e626bd8352fc9a2ca9e9 (diff) | |
Merge tag 'v5.4.129' into toradex_5.4.y
This is the 5.4.129 stable release
Conflicts:
- drivers/i2c/busses/i2c-imx.c
Resolve the conflict between upstream commit ef456a2d ("i2c: imx: Simplify stopped state tracking")
and previously backported one ea3cc015 ("i2c: imx: implement master_xfer_atomic callback").
- drivers/usb/chipidea/ci_hdrc_imx.c
The upstream commit 4202cbbd ("usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul")
conflicts with the Toradex's fix 5c557731 ("usb: chipidea: imx: disable runtime pm for imx6ull").
Resolve the conflict.
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/pd.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/usbnet.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h index 6655ce32feff..696230b53611 100644 --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -425,7 +425,7 @@ static inline unsigned int rdo_max_power(u32 rdo) #define PD_T_SENDER_RESPONSE 60 /* 24 - 30 ms, relaxed */ #define PD_T_SOURCE_ACTIVITY 45 #define PD_T_SINK_ACTIVITY 135 -#define PD_T_SINK_WAIT_CAP 240 +#define PD_T_SINK_WAIT_CAP 310 /* 310 - 620 ms */ #define PD_T_PS_TRANSITION 500 #define PD_T_SRC_TRANSITION 35 #define PD_T_DRP_SNK 40 diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index d8860f2d0976..fc6ed1311589 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -83,6 +83,8 @@ struct usbnet { # define EVENT_LINK_CHANGE 11 # define EVENT_SET_RX_MODE 12 # define EVENT_NO_IP_ALIGN 13 + u32 rx_speed; /* in bps - NOT Mbps */ + u32 tx_speed; /* in bps - NOT Mbps */ }; static inline struct usb_driver *driver_of(struct usb_interface *intf) |