Skip to content

Commit 74738c5

Browse files
committed
Merge tag 'usb-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH: "Here are some USB fixes for 5.14-rc3 to resolve a bunch of tiny problems reported. Included in here are: - dtsi revert to resolve a problem which broke android systems that relied on the dts name to find the USB controller device. People are still working out the "real" solution for this, but for now the revert is needed. - core USB fix for pipe calculation found by syzbot - typec fixes - gadget driver fixes - new usb-serial device ids - new USB quirks - xhci fixes - usb hub fixes for power management issues reported - other tiny fixes All have been in linux-next with no reported problems" * tag 'usb-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (27 commits) USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick Revert "USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem" usb: cdc-wdm: fix build error when CONFIG_WWAN_CORE is not set Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name" usb: dwc2: gadget: Fix sending zero length packet in DDMA mode. usb: dwc2: Skip clock gating on Samsung SoCs usb: renesas_usbhs: Fix superfluous irqs happen after usb_pkt_pop() usb: dwc2: gadget: Fix GOUTNAK flow for Slave mode. usb: phy: Fix page fault from usb_phy_uevent usb: xhci: avoid renesas_usb_fw.mem when it's unusable usb: gadget: u_serial: remove WARN_ON on null port usb: dwc3: avoid NULL access of usb_gadget_driver usb: max-3421: Prevent corruption of freed memory usb: gadget: Fix Unbalanced pm_runtime_enable in tegra_xudc_probe MAINTAINERS: repair reference in USB IP DRIVER FOR HISILICON KIRIN 970 usb: typec: stusb160x: Don't block probing of consumer of "connector" nodes usb: typec: stusb160x: register role switch before interrupt registration USB: usb-storage: Add LaCie Rugged USB3-FW to IGNORE_UAS usb: ehci: Prevent missed ehci interrupts with edge-triggered MSI usb: hub: Disable USB 3 device initiated lpm if exit latency is too high ...
2 parents e7562a0 + 1d1b97d commit 74738c5

36 files changed

Lines changed: 264 additions & 127 deletions

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19123,7 +19123,7 @@ M: Mauro Carvalho Chehab <mchehab@kernel.org>
1912319123
L: linux-usb@vger.kernel.org
1912419124
S: Maintained
1912519125
F: Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
19126-
F: drivers/phy/hisilicon/phy-kirin970-usb3.c
19126+
F: drivers/phy/hisilicon/phy-hi3670-usb3.c
1912719127

1912819128
USB ISP116X DRIVER
1912919129
M: Olav Kongas <ok@artecdesign.ee>

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@
10631063
status = "okay";
10641064
extcon = <&usb2_id>;
10651065

1066-
usb@7600000 {
1066+
dwc3@7600000 {
10671067
extcon = <&usb2_id>;
10681068
dr_mode = "otg";
10691069
maximum-speed = "high-speed";
@@ -1074,7 +1074,7 @@
10741074
status = "okay";
10751075
extcon = <&usb3_id>;
10761076

1077-
usb@6a00000 {
1077+
dwc3@6a00000 {
10781078
extcon = <&usb3_id>;
10791079
dr_mode = "otg";
10801080
};

arch/arm64/boot/dts/qcom/ipq8074.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
resets = <&gcc GCC_USB0_BCR>;
444444
status = "disabled";
445445

446-
dwc_0: usb@8a00000 {
446+
dwc_0: dwc3@8a00000 {
447447
compatible = "snps,dwc3";
448448
reg = <0x8a00000 0xcd00>;
449449
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
@@ -484,7 +484,7 @@
484484
resets = <&gcc GCC_USB1_BCR>;
485485
status = "disabled";
486486

487-
dwc_1: usb@8c00000 {
487+
dwc_1: dwc3@8c00000 {
488488
compatible = "snps,dwc3";
489489
reg = <0x8c00000 0xcd00>;
490490
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/msm8996.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,7 +2566,7 @@
25662566
power-domains = <&gcc USB30_GDSC>;
25672567
status = "disabled";
25682568

2569-
usb@6a00000 {
2569+
dwc3@6a00000 {
25702570
compatible = "snps,dwc3";
25712571
reg = <0x06a00000 0xcc00>;
25722572
interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
@@ -2873,7 +2873,7 @@
28732873
qcom,select-utmi-as-pipe-clk;
28742874
status = "disabled";
28752875

2876-
usb@7600000 {
2876+
dwc3@7600000 {
28772877
compatible = "snps,dwc3";
28782878
reg = <0x07600000 0xcc00>;
28792879
interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/msm8998.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1964,7 +1964,7 @@
19641964

19651965
resets = <&gcc GCC_USB_30_BCR>;
19661966

1967-
usb3_dwc3: usb@a800000 {
1967+
usb3_dwc3: dwc3@a800000 {
19681968
compatible = "snps,dwc3";
19691969
reg = <0x0a800000 0xcd00>;
19701970
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
&usb3 {
338338
status = "okay";
339339

340-
usb@7580000 {
340+
dwc3@7580000 {
341341
dr_mode = "host";
342342
};
343343
};

arch/arm64/boot/dts/qcom/qcs404.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@
544544
assigned-clock-rates = <19200000>, <200000000>;
545545
status = "disabled";
546546

547-
usb@7580000 {
547+
dwc3@7580000 {
548548
compatible = "snps,dwc3";
549549
reg = <0x07580000 0xcd00>;
550550
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
@@ -573,7 +573,7 @@
573573
assigned-clock-rates = <19200000>, <133333333>;
574574
status = "disabled";
575575

576-
usb@78c0000 {
576+
dwc3@78c0000 {
577577
compatible = "snps,dwc3";
578578
reg = <0x078c0000 0xcc00>;
579579
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/sc7180.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2756,7 +2756,7 @@
27562756
<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>;
27572757
interconnect-names = "usb-ddr", "apps-usb";
27582758

2759-
usb_1_dwc3: usb@a600000 {
2759+
usb_1_dwc3: dwc3@a600000 {
27602760
compatible = "snps,dwc3";
27612761
reg = <0 0x0a600000 0 0xe000>;
27622762
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/sdm845.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3781,7 +3781,7 @@
37813781
<&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
37823782
interconnect-names = "usb-ddr", "apps-usb";
37833783

3784-
usb_1_dwc3: usb@a600000 {
3784+
usb_1_dwc3: dwc3@a600000 {
37853785
compatible = "snps,dwc3";
37863786
reg = <0 0x0a600000 0 0xcd00>;
37873787
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
@@ -3829,7 +3829,7 @@
38293829
<&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>;
38303830
interconnect-names = "usb-ddr", "apps-usb";
38313831

3832-
usb_2_dwc3: usb@a800000 {
3832+
usb_2_dwc3: dwc3@a800000 {
38333833
compatible = "snps,dwc3";
38343834
reg = <0 0x0a800000 0 0xcd00>;
38353835
interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/sm8150.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2344,7 +2344,7 @@
23442344

23452345
resets = <&gcc GCC_USB30_PRIM_BCR>;
23462346

2347-
usb_1_dwc3: usb@a600000 {
2347+
usb_1_dwc3: dwc3@a600000 {
23482348
compatible = "snps,dwc3";
23492349
reg = <0 0x0a600000 0 0xcd00>;
23502350
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)