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

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

Merge "ARM: dts: msm: Enable support for QDSS over USB for mdmcalifornium"

parents 317878b5 29264653

arch/arm/boot/dts/qcom/mdmcalifornium-usb.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
		USB3_GDSC-supply = <&gdsc_usb30>;

		vdda33-supply = <&pmdcalifornium_l10>;

		vdda18-supply = <&pmdcalifornium_l5>;

		qcom,usb-dbm = <&dbm_1p5>;



		qcom,msm-bus,name = "usb3";

		qcom,msm-bus,num-cases = <2>;
@@ -66,6 +67,38 @@ 
			snps,usb3-u1u2-disable;

			snps,num-gsi-evt-buffs = <0x3>;

		};



		qcom,usbbam@0x8B04000 {

			compatible = "qcom,usb-bam-msm";

			reg = <0x8b04000 0x1b000>;

			interrupt-parent = <&intc>;

			interrupts = <0 132 0>;



			qcom,bam-type = <0>;

			qcom,usb-bam-fifo-baseaddr = <0x08604000>;

			qcom,usb-bam-num-pipes = <1>;

			qcom,ignore-core-reset-ack;

			qcom,disable-clk-gating;

			qcom,usb-bam-override-threshold = <0x4001>;

			qcom,usb-bam-max-mbps-highspeed = <400>;

			qcom,usb-bam-max-mbps-superspeed = <3600>;

			qcom,reset-bam-on-connect;



			qcom,pipe0 {

				label = "ssusb-qdss-in-0";

				qcom,usb-bam-mem-type = <2>;

				qcom,dir = <1>;

				qcom,pipe-num = <0>;

				qcom,peer-bam = <0>;

				qcom,peer-bam-physical-address = <0x00884000>;

				qcom,src-bam-pipe-index = <0>;

				qcom,dst-bam-pipe-index = <2>;

				qcom,data-fifo-offset = <0x0>;

				qcom,data-fifo-size = <0xc00>;

				qcom,descriptor-fifo-offset = <0xc00>;

				qcom,descriptor-fifo-size = <0x400>;

			};

		};

	};



	android_usb@86000c8 {
@@ -213,4 +246,10 @@ 
			      "phy_reset", "phy_phy_reset",

			      "ref_clk_src", "ref_clk";

	};



	dbm_1p5: dbm@0x8af8000 {

		compatible = "qcom,usb-dbm-1p5";

		reg = <0x08af8000 0x300>;

		qcom,reset-ep-after-lpm-resume;

	};

};

drivers/platform/msm/usb_bam.c

+2 −1
Original line number Diff line number Diff line
@@ -3221,7 +3221,8 @@ static int usb_bam_probe(struct platform_device *pdev) 
	pm_runtime_enable(&pdev->dev);



	spin_lock_init(&usb_bam_ipa_handshake_info_lock);

	if (ipa_is_ready())

	if (ipa_get_transport_type() == IPA_TRANSPORT_TYPE_SPS &&

			ipa_is_ready())

		usb_bam_ipa_create_resources(bam_type);

	spin_lock_init(&ctx->usb_bam_lock);