Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c91ca0a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents fdda6c7a f123787c

Documentation/devicetree/bindings/usb/dwc3.txt

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ Optional properties: 
 - 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.

 - 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.

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

+0 −2
Original line number Diff line number Diff line
@@ -2018,7 +2018,6 @@ 
			snps,nominal-elastic-buffer;

			snps,is-utmi-l1-suspend;

			snps,hird-threshold = /bits/ 8 <0x0>;

			usb-core-id = <0>;

		};



		qcom,usbbam@6b04000 {
@@ -2127,7 +2126,6 @@ 
			snps,nominal-elastic-buffer;

			snps,is-utmi-l1-suspend;

			snps,hird-threshold = /bits/ 8 <0x0>;

			usb-core-id = <1>;

		};

	};

drivers/usb/host/xhci-plat.c

+0 −4
Original line number Diff line number Diff line
@@ -233,10 +233,6 @@ static int xhci_plat_probe(struct platform_device *pdev) 


	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);

	if (IS_ERR(hcd->usb_phy)) {

		ret = PTR_ERR(hcd->usb_phy);

drivers/usb/host/xhci.h

+0 −2
Original line number Diff line number Diff line
@@ -1519,8 +1519,6 @@ struct xhci_hcd { 
	/* secondary interrupter */

	struct	xhci_intr_reg __iomem **sec_ir_set;



	int		core_id;



	/* Cached register copies of read-only HC data */

	__u32		hcs_params1;

	__u32		hcs_params2;