Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'fixes-for-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v4.16-rc4

Just small fixes now. The two most important are a fix for a a lock up
on USB ID pin change during system suspend/resume on dwc3 and a
use-after-free fix in ffs_fs_kill_sb().

Apart from that, some DT compatible fixes.

+7 -6
+1 -1
Documentation/devicetree/bindings/usb/dwc2.txt
··· 19 19 configured in FS mode; 20 20 - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs 21 21 configured in HS mode; 22 - - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs 22 + - "st,stm32f7-hsotg": The DWC2 USB HS controller instance in STM32F7 SoCs 23 23 configured in HS mode; 24 24 - reg : Should contain 1 register range (address and length) 25 25 - interrupts : Should contain 1 interrupt
+1
Documentation/devicetree/bindings/usb/renesas_usb3.txt
··· 4 4 - compatible: Must contain one of the following: 5 5 - "renesas,r8a7795-usb3-peri" 6 6 - "renesas,r8a7796-usb3-peri" 7 + - "renesas,r8a77965-usb3-peri" 7 8 - "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 compatible 8 9 device 9 10
+1
Documentation/devicetree/bindings/usb/renesas_usbhs.txt
··· 12 12 - "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device 13 13 - "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device 14 14 - "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device 15 + - "renesas,usbhs-r8a77965" for r8a77965 (R-Car M3-N) compatible device 15 16 - "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device 16 17 - "renesas,usbhs-r7s72100" for r7s72100 (RZ/A1) compatible device 17 18 - "renesas,rcar-gen2-usbhs" for R-Car Gen2 or RZ/G1 compatible devices
+3 -3
drivers/usb/dwc2/params.c
··· 137 137 p->activate_stm_fs_transceiver = true; 138 138 } 139 139 140 - static void dwc2_set_stm32f7xx_hsotg_params(struct dwc2_hsotg *hsotg) 140 + static void dwc2_set_stm32f7_hsotg_params(struct dwc2_hsotg *hsotg) 141 141 { 142 142 struct dwc2_core_params *p = &hsotg->params; 143 143 ··· 164 164 { .compatible = "st,stm32f4x9-fsotg", 165 165 .data = dwc2_set_stm32f4x9_fsotg_params }, 166 166 { .compatible = "st,stm32f4x9-hsotg" }, 167 - { .compatible = "st,stm32f7xx-hsotg", 168 - .data = dwc2_set_stm32f7xx_hsotg_params }, 167 + { .compatible = "st,stm32f7-hsotg", 168 + .data = dwc2_set_stm32f7_hsotg_params }, 169 169 {}, 170 170 }; 171 171 MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
+1 -1
drivers/usb/dwc3/core.c
··· 175 175 dwc->desired_dr_role = mode; 176 176 spin_unlock_irqrestore(&dwc->lock, flags); 177 177 178 - queue_work(system_power_efficient_wq, &dwc->drd_work); 178 + queue_work(system_freezable_wq, &dwc->drd_work); 179 179 } 180 180 181 181 u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type)
-1
drivers/usb/gadget/function/f_fs.c
··· 1538 1538 if (sb->s_fs_info) { 1539 1539 ffs_release_dev(sb->s_fs_info); 1540 1540 ffs_data_closed(sb->s_fs_info); 1541 - ffs_data_put(sb->s_fs_info); 1542 1541 } 1543 1542 } 1544 1543