evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "usb: host: Add support for usb core indexing""

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-19 14:01:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1c91ca0a97
4 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/devicetree/bindings/usb/dwc3.txt
View file

@ -61,7 +61,6 @@ Optional properties:
- snps,num-gsi-evt-buffs: If present, specifies number of GSI based hardware accelerated event buffers. - snps,num-gsi-evt-buffs: If present, specifies number of GSI based hardware accelerated event buffers.
1 event buffer is needed per h/w accelerated endpoint. 1 event buffer is needed per h/w accelerated endpoint.
- xhci-imod-value: Interrupt moderation interval for host mode (in increments of 250nsec). - xhci-imod-value: Interrupt moderation interval for host mode (in increments of 250nsec).
- usb-core-id: Differentiates between different controllers present on a device.
This is usually a subnode to DWC3 glue to which it is connected. This is usually a subnode to DWC3 glue to which it is connected.

2
arch/arm/boot/dts/qcom/msm8996.dtsi
View file

@ -2018,7 +2018,6 @@
snps,nominal-elastic-buffer; snps,nominal-elastic-buffer;
snps,is-utmi-l1-suspend; snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>; snps,hird-threshold = /bits/ 8 <0x0>;
usb-core-id = <0>;
}; };
qcom,usbbam@6b04000 { qcom,usbbam@6b04000 {
@ -2127,7 +2126,6 @@
snps,nominal-elastic-buffer; snps,nominal-elastic-buffer;
snps,is-utmi-l1-suspend; snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>; snps,hird-threshold = /bits/ 8 <0x0>;
usb-core-id = <1>;
}; };
}; };

4
drivers/usb/host/xhci-plat.c
View file

@ -233,10 +233,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
hcd_to_bus(xhci->shared_hcd)->skip_resume = true; hcd_to_bus(xhci->shared_hcd)->skip_resume = true;
if (device_property_read_u32(pdev->dev.parent, "usb-core-id",
&xhci->core_id))
xhci->core_id = -EINVAL;
hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
if (IS_ERR(hcd->usb_phy)) { if (IS_ERR(hcd->usb_phy)) {
ret = PTR_ERR(hcd->usb_phy); ret = PTR_ERR(hcd->usb_phy);

2
drivers/usb/host/xhci.h
View file

@ -1519,8 +1519,6 @@ struct xhci_hcd {
/* secondary interrupter */ /* secondary interrupter */
struct xhci_intr_reg __iomem **sec_ir_set; struct xhci_intr_reg __iomem **sec_ir_set;
int core_id;
/* Cached register copies of read-only HC data */ /* Cached register copies of read-only HC data */
__u32 hcs_params1; __u32 hcs_params1;
__u32 hcs_params2; __u32 hcs_params2;